Merge remote-tracking branch 'origin/master'

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

@@ -5483,34 +5483,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
+                }else{
+                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
                 }
                 busSalesOrder = fetchBySid(bv.getBusinessSid());
-                //为三方金融和担保贷款
-               /* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
-                    //根据销售订单sid查询金融方案
-                    ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
-                    SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
-                    if (solutionsDetailsVo != null) {
-                        if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
-                            //推送车款
-                            if ("02".equals(solutionsDetailsVo.getTypeKey())) {
-                                //外部金融
-                                createFin(vo, busSalesOrder, solutionsDetailsVo);
-                            } else {
-                                //自营非担保
-                                createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
-                            }
-                        } else {//担保贷款
-                            createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
-                        }
-                    } else {
-                        //推送车款
-                        createCarFin(vo, busSalesOrder);
-                    }
-                } else {
-                    //推送车款
-                    createCarFin(vo, busSalesOrder);
-                }*/
                 //==============================修改车辆的持久状态组装数据
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -5663,6 +5639,45 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     }
 
+    public void updateNo(String sid,String contractNo){
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
+        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        //查询销售订单的车型信息
+        AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
+        //添加推送至款项确认的应收未收明细中
+        List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
+        //更新销售订单的临时号
+        if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {//贷款
+            for (int i = 0; i < vinList.size(); i++) {
+                VinListsVo vinListsVo = vinList.get(i);
+                //销售订单中车辆表的sid
+                String salesOrderVinSid = vinList.get(i).getSid();
+                String temporaryNum = String.format("%02d", i + 1);
+                String temporaryNo = contractNo + temporaryNum;
+                String temporaryName = "";
+                if (vinListsVo.getVinNo() != null) {
+                    temporaryName = appOrderDetailsVo.getName() + vinListsVo.getVinNo();
+                } else {
+                    temporaryName = appOrderDetailsVo.getName() + temporaryNo;
+                }
+                //更新临时号
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo, temporaryName);
+            }
+        } else {
+            for (int i = 0; i < vinList.size(); i++) {
+                //销售订单中车辆表的sid
+                String salesOrderVinSid = vinList.get(i).getSid();
+                String temporaryNum = String.format("%02d", i + 1);
+                //更新临时号
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum, "");
+            }
+
+        }
+    }
+
     /**
      * 外部金融推送车款（去掉厂家贴息）
      *
@@ -6689,6 +6704,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
+                }else{
+                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
                 }
             }
         } else {