Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -36,6 +36,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
             if (baseVehicleState != null) {
                 if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
                     //销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
+                    baseVehicleState.setSaleTypeKey(dto.getSaleTypeKey());
+                    baseVehicleState.setFinSourceKey(dto.getFinSourceKey());
                     baseVehicleState.setFinState("0");
                     baseVehicleState.setCarryVehicleState("0");
                     baseVehicleState.setCarryInvoiceState("0");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5518,6 +5518,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     ExecutorService pool = new ThreadPoolExecutor(2, 100,
                             0L, TimeUnit.MILLISECONDS,
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    BusSalesOrder finalBusSalesOrder2 = busSalesOrder;
                     Future future1 = pool.submit(() -> {
                         List<BaseVehicleStateDto> dtoList = new ArrayList<>();
                         List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
@@ -5532,6 +5533,33 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 }
                                 baseVehicleStateDto.setSaleOrderSid(v.getSalesOrderSid());
                                 baseVehicleStateDto.setBusSid(v.getSid());
+                                baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrder2.getPayTypeKey());
+                                if ("2".equals(finalBusSalesOrder2.getPayTypeKey())) {//贷款
+                                    SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrder2.getSid()).getData();
+                                    if (loanSolutions != null) {
+                                        if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                                            baseVehicleStateDto.setFinSourceKey("4");//担保
+                                        } else {
+                                            baseVehicleStateDto.setFinSourceKey("3");//自营非担保
+                                        }
+                                    }
+                                } else {
+                                    if ("2".equals(finalBusSalesOrder2.getFinancePlan())) {
+                                        baseVehicleStateDto.setFinSourceKey(finalBusSalesOrder2.getFinancePlan());
+                                        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrder2.getSid()).getData();
+                                        if (loanSolutions != null) {
+                                            if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
+                                                if ("02".equals(loanSolutions.getTypeKey())) {
+                                                    baseVehicleStateDto.setFinSourceKey("2");//三方金融
+                                                } else {
+                                                    baseVehicleStateDto.setFinSourceKey("3");//自营非担保
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        baseVehicleStateDto.setFinSourceKey(finalBusSalesOrder2.getFinancePlan());
+                                    }
+                                }
                                 dtoList.add(baseVehicleStateDto);
                             });
                             ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
@@ -7168,8 +7196,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 newSalesOrder.setMobile(customerMobile);
                 ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
                 if (crmCustomerTempVoResultBean.getData() != null) {
-                    newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
-                    newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
+                    newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerType());
+                    newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerTypeKey());
                 }
             }
             saleOrderSave = this.save(newSalesOrder);