From a62ec203320cf00f22791d1188360cfafa094b4c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 27 Jul 2023 09:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehiclestate/BaseVehicleState.java   |  2 ++
 .../basevehiclestate/BaseVehicleStateDto.java    |  4 ++++
 .../biz/bussalesorder/BusSalesOrderService.java  | 16 ++++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
index eaef7640e7..e3b4e4402a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
@@ -36,6 +36,8 @@ public class BaseVehicleState extends BaseEntity {
     private String packageBusiness;
     @ApiModelProperty("合同状态")
     private String contractState;
+    private String saleTypeKey;
+    private String finSourceKey;
 
 
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java
index 8f61d8d56c..8dc5163630 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java
@@ -21,4 +21,8 @@ public class BaseVehicleStateDto implements Dto {
     private String busSid;
     @ApiModelProperty("操作类型")
     private String operateType;
+    @ApiModelProperty("销售类型：1全款，2贷款")
+    private String saleTypeKey;
+    @ApiModelProperty("款项来源：1自有资金、2三方金融、3担保、4非担保")
+    private String finSourceKey;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 11aa22963a..e95a9d5bb4 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -4775,9 +4775,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();*/
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
                 //更新已选择的车架号的状态为审批中
                 List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
                 BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -4798,12 +4798,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             //==============================新增车辆的持久状态组装数据
+            busSalesOrderOne = fetchBySid(businessSid);
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();
                 ExecutorService pool = new ThreadPoolExecutor(2, 100,
                         0L, TimeUnit.MILLISECONDS,
                         new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                BusSalesOrder finalBusSalesOrderOne = busSalesOrderOne;
                 Future future1 = pool.submit(() -> {
                     List<BaseVehicleStateDto> dtoList = new ArrayList<>();
                     List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(businessSid);
@@ -4816,6 +4818,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 baseVehicleStateDto.setVinSid(v.getLinkSid());
                                 baseVehicleStateDto.setVinNo(v.getLinkNo());
                             }
+                            baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
+                            baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
                             baseVehicleStateDto.setBusSid(v.getSid());
                             dtoList.add(baseVehicleStateDto);
                         });
@@ -4861,9 +4865,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setInstanceId(dto.getProcInsId());
             //流程定义id
             bv.setModelId(busSalesOrder.get().getProcDefId());
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();*/
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
                 //更新已选择的车架号的状态为审批中
                 List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
                 BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();