From 4e08e5252ff122b7fbce1605f96d893d21dcd052 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 22 Dec 2022 13:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusVehicleOrderService.java               |  8 +++
 .../biz/busdeposit/BusDepositMapper.xml       |  4 +-
 .../busmaindeposit/BusMainDepositService.java |  2 +
 .../FinCollectionConfirmationService.java     | 71 +++++++++++--------
 .../deposit/DepositCompleteDto.java           |  1 +
 .../vehicle/VehicleCompleteDto.java           |  1 +
 6 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
index 701dc44c6f..f6a7d8b535 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
@@ -260,8 +260,16 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setNodeState("待提交");
                 scmApplyInbound.setNum(dto.getPlatformNo());
                 String contractPrice = baseMapper.getContractPrice(dto.getPurchaseApplyMediumModelSid());
+                if(contractPrice != null){
+                    if(StringUtils.isNotBlank(contractPrice)){
+                        scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
+                        scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
+                    }
+                }
+                /*
                 scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
                 scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
+                */
                 scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode());
                 scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
                 scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
index 8bfc206d7a..04919f1d38 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
@@ -11,8 +11,8 @@
                createTime      AS virtualOrderDate,
                deposit,
                paymentDate     AS payDate,
-               payType         AS payTypeValue,
-               payTypeKey      AS payType,
+               payType         AS payType,
+               payTypeKey      AS payTypeKey,
                draweeName      AS payName,
                payBankAcc      AS payNumber,
                proBankValue    AS collectionBank,
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 57ab5672eb..a27df091e4 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -2050,9 +2050,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusMainDeposit busMainDeposit = fetchBySid(bv.getBusinessSid());
+        /*
         String userSid = bv.getUserSid();
         SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
         bv.setOrgSidPath(data.getOrgSidPath());
+        */
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("virtualOrderSid", bv.getBusinessSid());
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 4a18ebc67f..f54f41c32e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1366,24 +1366,25 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
         }
         //销售部门
-        resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());
-        if (resultBean.getSuccess()) {
-            SysOrganizationVo vo = resultBean.getData();
-            if (vo != null) {
-                arReceivebill.setFSALEDEPTID(vo.getOrgCode());
+        if (StringUtils.isNotBlank(confirmation.getCreateDeptSid())) {
+            resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo = resultBean.getData();
+                if (vo != null) {
+                    arReceivebill.setFSALEDEPTID(vo.getOrgCode());
+                }
             }
         }
-        //应付类别key、value
-
         //物料列表
         List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1,"车款");
+        //推送车款
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款");
         finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
-        if(!finSelectedReceivablesDetailedVos1.isEmpty()){
+        if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
             //结算方式
             freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
-            freceivebillentry.setFSETTLETYPEIDType("paymentType");
+            freceivebillentry.setFSETTLETYPEIDType("customerPayType");
             BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
             //收款金额
             freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
@@ -1393,19 +1394,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             freceivebillentry.setFPURPOSEIDKey("001");
             freceivebillentry.setFPURPOSEIDType("cw_skyt");
             fEntityList.add(freceivebillentry);
+            //项目类别key、value
+            arReceivebill.setF_PAEZ_AssistantType("payType");
+            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid());
+            arReceivebill.setF_PAEZ_AssistantKey(finUncollectedReceivablesDetailed.getPayTypeKey());
             arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
             ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
         }
 
         //推送订金
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1,"订金");
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金");
         fEntityList = new ArrayList<>();
         freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
         finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
-        if(!finSelectedReceivablesDetailedVos2.isEmpty()){
+        if (!finSelectedReceivablesDetailedVos2.isEmpty()) {
             //结算方式
             freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
-            freceivebillentry.setFSETTLETYPEIDType("paymentType");
+            freceivebillentry.setFSETTLETYPEIDType("customerPayType");
             BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
             //收款金额
             freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
@@ -1416,28 +1421,32 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             freceivebillentry.setFPURPOSEIDType("cw_skyt");
             fEntityList.add(freceivebillentry);
             arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
+            //项目类别key、value
+            arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
+            arReceivebill.setF_PAEZ_AssistantKey("006");
             ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
         }
-        if(finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()){
+        //简易订单-订金收取
+        if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) {
             fEntityList = new ArrayList<>();
             freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
-            finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
-            if(!finSelectedReceivablesDetailedVos2.isEmpty()){
-                //结算方式
-                freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
-                freceivebillentry.setFSETTLETYPEIDType("paymentType");
-                BigDecimal bigAll = confirmation.getCollectionMoney();
-                //收款金额
-                freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
-                //登记日期
-                freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
-                //收款用途
-                freceivebillentry.setFPURPOSEIDKey("002");
-                freceivebillentry.setFPURPOSEIDType("cw_skyt");
-                fEntityList.add(freceivebillentry);
-                arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
-                ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
-            }
+            //结算方式
+            freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
+            freceivebillentry.setFSETTLETYPEIDType("customerPayType");
+            BigDecimal bigAll = confirmation.getCollectionMoney();
+            //收款金额
+            freceivebillentry.setFRECTOTALAMOUNTFOR(bigAll.toString());
+            //登记日期
+            freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
+            //收款用途:订金
+            freceivebillentry.setFPURPOSEIDKey("002");
+            freceivebillentry.setFPURPOSEIDType("cw_skyt");
+            fEntityList.add(freceivebillentry);
+            arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
+            //项目类别key、value
+            arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
+            arReceivebill.setF_PAEZ_AssistantKey("006");
+            ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
 
         }
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java
index 7b96d8ca30..bfd9de469b 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java
@@ -14,6 +14,7 @@ public class DepositCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @JsonProperty("orgPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java
index 6ac97979f9..a7e9e204bb 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java
@@ -15,6 +15,7 @@ public class VehicleCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
+    @JsonProperty("orgPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")