From bef84f293f019f8297518b7ba44fe4860e8367df Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 16 May 2023 13:30:59 +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

---
 .../bussalesorder/BusSalesOrderService.java   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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 834741625a..afbfc17551 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
@@ -4888,7 +4888,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
                 }
-
+                busSalesOrder = fetchBySid(bv.getBusinessSid());
                 //为三方金融和担保贷款
                 if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
                     //根据销售订单sid查询金融方案
@@ -4963,20 +4963,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
-        CommonContract commonContract = commonContractResultBean.getData();
+        /*ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
+        CommonContract commonContract = commonContractResultBean.getData();*/
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
-                if (commonContract != null) {
+               /* if (commonContract != null) {
                     //合同sid
                     unCollectionDto.setContractSid(commonContract.getSid());
                     //合同编号
                     unCollectionDto.setContractNo(commonContract.getContractNo());
-                }
+                }*/
+                unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
                 //客户sid
@@ -5016,8 +5017,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
-        CommonContract commonContract = commonContractResultBean.getData();
+        /*ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
+        CommonContract commonContract = commonContractResultBean.getData();*/
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(solutionsDetailsVo.getRealTotal()).subtract(new BigDecimal(deposit)).toString();
@@ -5025,9 +5026,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
                 //合同sid
-                unCollectionDto.setContractSid(commonContract.getSid());
+//                unCollectionDto.setContractSid(commonContract.getSid());
                 //合同编号
-                unCollectionDto.setContractNo(commonContract.getContractNo());
+                unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
                 //客户sid
@@ -5067,8 +5068,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
-        CommonContract commonContract = commonContractResultBean.getData();
+        /*ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
+        CommonContract commonContract = commonContractResultBean.getData();*/
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
@@ -5076,9 +5077,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
                 //合同sid
-                unCollectionDto.setContractSid(commonContract.getSid());
+//                unCollectionDto.setContractSid(commonContract.getSid());
                 //合同编号
-                unCollectionDto.setContractNo(commonContract.getContractNo());
+                unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
                 //客户sid