pc端未售买断修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -22,7 +22,11 @@
                insideCode,
                vehicleNum,
                dayNum,
-               actualMoney
+               actualMoney,
+               vehicleVersionValue,
+               fuelTypeValue,
+               gearboxTypeValue,
+               emissionStandardValue
         from base_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java

@@ -5,11 +5,13 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -34,6 +36,9 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService<BaseVehi
             baseVehicleActualDetails = new BaseVehicleActualDetails();
             BeanUtils.copyProperties(dto, baseVehicleActualDetails, "sid");
             baseVehicleActualDetails.setVehicleActualSid(saleSid);
+            if(StringUtils.isNotBlank(dto.getActualMoney())){
+                baseVehicleActualDetails.setActualMoney(new BigDecimal(dto.getActualMoney()));
+            }
             save(baseVehicleActualDetails);
         }
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java

@@ -4,10 +4,12 @@ import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -21,12 +23,15 @@ public class BaseVehicleActualPayService extends MybatisBaseService<BaseVehicleA
 
     @Transactional(rollbackFor = Exception.class)
     public void saveDetails(List<BaseVehicleActualPayDto> detailsPayList, String sid) {
-        BaseVehicleActualPay BaseVehicleActualPay = null;
+        BaseVehicleActualPay baseVehicleActualPay = null;
         for (BaseVehicleActualPayDto dto : detailsPayList) {
-            BaseVehicleActualPay = new BaseVehicleActualPay();
-            BeanUtils.copyProperties(dto, BaseVehicleActualPay, "sid");
-            BaseVehicleActualPay.setVehicleActualSid(sid);
-            save(BaseVehicleActualPay);
+            baseVehicleActualPay = new BaseVehicleActualPay();
+            BeanUtils.copyProperties(dto, baseVehicleActualPay, "sid");
+            baseVehicleActualPay.setVehicleActualSid(sid);
+            if(StringUtils.isNotBlank(dto.getPayAccount())){
+                baseVehicleActualPay.setPayAccount(new BigDecimal(dto.getPayAccount()));
+            }
+            save(baseVehicleActualPay);
         }
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -447,6 +447,33 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            } else {
+
+              /*  if (busVehicleApply.getCurrentAmount() > 0) {
+                    FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                    finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
+                    finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
+                    finPaymentrecordDto.setPayType(1);
+                    finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
+                    finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                    finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
+                    finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
+                    finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
+                    finPaymentrecordDto.setCostTypeKey("001");
+                    finPaymentrecordDto.setCostTypeValue("排产");
+                    //查询收款单位和收款账号
+                    List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
+                    String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
+                    //根据车型sid查询账户名称和银行账号
+                    List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
+                    busApplyVo.removeAll(Collections.singleton(null));
+                    if (!busApplyVo.isEmpty()) {
+                        finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
+                        finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
+                    }
+                    finPaymentrecordDto.setBusSid(r.getData());
+                    finPaymentrecordFeign.save(finPaymentrecordDto);
+                }*/
             }
 
             return rb.success().setData(resultBean.getData());