优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -817,9 +817,23 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if ("1".equals(busDeliveredApply.getPaymentMethodKey())) {
             baseVehicleZSOutApplyDto.setSaleTypeKey("001");
             baseVehicleZSOutApplyDto.setSaleTypeValue("全款车");
+            baseVehicleZSOutApplyDto.setCustomerName(busDeliveredApply.getName());
+            baseVehicleZSOutApplyDto.setCustomerSid(busDeliveredApply.getCustomerSid());
+            //客户编码
+            ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getCustomerSid());
+            if (crmCustomerTempVoResultBean.getData() != null) {
+                baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo());
+            }
         } else {
             baseVehicleZSOutApplyDto.setSaleTypeKey("002");
             baseVehicleZSOutApplyDto.setSaleTypeValue("贷款车");
+            baseVehicleZSOutApplyDto.setCustomerName(busDeliveredApply.getLoanName());
+            baseVehicleZSOutApplyDto.setCustomerSid(busDeliveredApply.getLoanSid());
+            //客户编码
+            ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getLoanSid());
+            if (crmCustomerTempVoResultBean.getData() != null) {
+                baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo());
+            }
         }
         baseVehicleZSOutApplyDto.setSaleDate(DateUtil.today());
         baseVehicleZSOutApplyDto.setOrgSid(busDeliveredApply.getStaffDeptSid());
@@ -829,9 +843,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
 
         baseVehicleZSOutApplyDto.setStaffName(busDeliveredApply.getStaffName());
-        baseVehicleZSOutApplyDto.setCustomerName(busDeliveredApply.getName());
+
         baseVehicleZSOutApplyDto.setMobile(busDeliveredApply.getMobile());
-        baseVehicleZSOutApplyDto.setCustomerSid(busDeliveredApply.getCustomerSid());
+
         //总成交价
         baseVehicleZSOutApplyDto.setTotalDealPrice(new BigDecimal(busDeliveredApply.getPrice()).multiply(new BigDecimal(detailsList.size())).toString());
         baseVehicleZSOutApplyDto.setCreateOrgSid(busDeliveredApply.getUseOrgSid());
@@ -846,11 +860,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         //合同编号
         baseVehicleZSOutApplyDto.setContractNo(busDeliveredApply.getContractNo());
-        //客户编码
-        ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getCustomerSid());
-        if (crmCustomerTempVoResultBean.getData() != null) {
-            baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo());
-        }
+
         //实际购车人key
         baseVehicleZSOutApplyDto.setBuyerTypeKey(busDeliveredApply.getTypeKey());
         baseVehicleZSOutApplyDto.setBuyerTypeValue(busDeliveredApply.getType());