From 1e5a462b4224ffc1b277af0f648459baabc8652b Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 1 Aug 2023 17:10:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdelivered/BusDeliveredMapper.xml   | 89 ++++++++++++++++---
 .../busmaindeposit/BusMainDepositService.java |  2 +
 .../bussalesorder/BusSalesOrderService.java   | 20 +++++
 .../FinCollectionConfirmation.java            |  3 +
 .../app/FinConfirmDto.java                    |  3 +
 .../FinUncollectedReceivablesDetailed.java    |  6 ++
 .../UnCollectionDto.java                      |  6 ++
 .../FinCollectionConfirmationService.java     | 66 ++++++++++++--
 8 files changed, 176 insertions(+), 19 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
index 228201e83c..30a5ab972b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@@ -280,27 +280,71 @@
     </select>
 
     <select id="selectListsVoNew" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
-        select
+      select a.* from(select
         bo.contractNo,
         bo.customerName as name,
         bo.payType paymentMethod,
         RIGHT(bv.linkNo, 8) as vinNo,
         bv.linkSid vinSid,
         bv.sid busVinSid
-        from  (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = '1')) as bs
-        left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
-        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
+        FROM
+        bus_sales_order bo
+        LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
+        LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+        LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
         <where>
             ${ew.sqlSegment}
             and length(bv.linkSid) > 0
+            AND bv.sid IN (
+            SELECT
+            busSid
+            FROM
+            anrui_base.base_vehicle_state
+            WHERE
+            busState = '401'
+            AND ( finState = '1' OR carryVehicleState = 1 ))  AND bbv.vehicleState != '0002'
         </where>
-        order by bo.contractNo desc
+        order by bo.contractNo desc) a
 
     </select>
 
     <select id="getRetrievalNotListNew" resultMap="listMaps">
-        select
+        select a.* from (SELECT
+        bo.contractNo,
+        bo.customerName AS name,
+        bo.payType paymentMethod,
+        bbv.vehicleState
+        FROM
+        bus_sales_order bo
+        LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
+        LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+        LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid) > 0
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bo.contractNo
+                , '')
+                , ifnull(bo.`customerName`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            AND bv.sid IN (
+            SELECT
+            busSid
+            FROM
+            anrui_base.base_vehicle_state
+            WHERE
+            busState = '401'
+            AND ( finState = '1' OR carryVehicleState = 1 ))
+            AND bbv.vehicleState != '0002'
+        </where>
+        GROUP BY
+        bo.contractNo
+        ORDER BY
+        bo.contractNo DESC)a
+        <!--select
         bo.contractNo,
         bo.customerName as name,
         bo.payType paymentMethod
@@ -311,9 +355,18 @@
         <where>
             ${ew.sqlSegment}
             and length(bv.linkSid) > 0
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bo.contractNo
+                , '')
+                , ifnull(bo.`customerName`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            and bbv.vehicleState != '0002'
         </where>
         group by contractNo
-        order by bo.contractNo desc
+        order by bo.contractNo desc-->
     </select>
 
     <resultMap id="listMaps" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
@@ -325,10 +378,26 @@
         </collection>
     </resultMap>
     <select id="vinLists" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
-        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
+    <!--    select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
         from (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = 1)) as bs
         left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+        left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
             left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
+        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}  and bbv.vehicleState != '0002'-->
+        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
+        FROM
+        bus_sales_order bo
+        LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
+        LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+        LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
+        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}  and bbv.vehicleState != '0002'
+        AND bv.sid IN (
+        SELECT
+        busSid
+        FROM
+        anrui_base.base_vehicle_state
+        WHERE
+        busState = '401'
+        AND ( finState = '1' OR carryVehicleState = 1 ))
     </select>
 </mapper>
\ No newline at end of file
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 ba0c2a6e2e..356d210250 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
@@ -1648,6 +1648,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid());
             finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept());
             finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid());
+            finConfirmDto.setOrgSidPath(busMainDeposit.getOrgSidPath());
+            finConfirmDto.setUseOrgName(busMainDeposit.getOrgName());
             finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
         }
         if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
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 a51cd317b9..8b709b7d4f 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
@@ -5098,6 +5098,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
                 BusSalesOrder busSalesOrder = fetchBySid(appOrderDetailsVo.getBusSalesOrderSid());
                 unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
+                unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setStaffName(busSalesOrder.getStaffName());
+                unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
+                unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }
@@ -5308,6 +5313,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
                 unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
                 unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
+                unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setStaffName(busSalesOrder.getStaffName());
+                unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
+                unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }
@@ -5358,6 +5368,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
                 unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
                 unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
+                unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setStaffName(busSalesOrder.getStaffName());
+                unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
+                unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }
@@ -5408,6 +5423,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
                 unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
                 unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
+                unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setStaffName(busSalesOrder.getStaffName());
+                unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
+                unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
index 68a44ee15f..ce85e313f8 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
@@ -138,4 +138,7 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String downNum;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
index 6d4bfd4762..5c63f16fef 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
@@ -101,6 +101,9 @@ public class FinConfirmDto implements Dto {
     @ApiModelProperty("销售专员部门sid")
     private String staffDeptSid;
 
+    private String orgSidPath;
+    private String useOrgName;
+
 
 
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
index 4edc68c226..da2db484b9 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
@@ -100,4 +100,10 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
 
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath;
+
+    private String staffName;
+    private String staffUserSid;
+    private String staffDeptName;
+    private String staffDeptSid;
+    private String useOrgName;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
index fd1568a71b..bbea20e7a4 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
@@ -66,4 +66,10 @@ public class UnCollectionDto implements Dto {
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath;
 
+    private String staffName;
+    private String staffUserSid;
+    private String staffDeptName;
+    private String staffDeptSid;
+    private String useOrgName;
+
 }
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 db9f23b07d..57d18068b5 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
@@ -408,23 +408,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
                 }
             }
+            //根据用户sid查询分公司sid
+            String useOrgSid = "";
+            if (StringUtils.isNotBlank(dto.getOrgPath())) {
+                useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+            } else {
+                useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+            }
             //对收款申请进行赋值操作
             FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
             BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
             if (StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())) {
+                //收款
                 finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
                 finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
                 finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
                 finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
+                String orgPath = dto.getOrgPath();
+                finCollectionConfirmation.setOrgSidPath(orgPath);
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
+                if(sysOrganizationVoResultBean.getData() != null){
+                    finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
+                }
+
+            }else{
+                //代收款
+                String orgPath = dto.getOrgPath();
+                finCollectionConfirmation.setOrgSidPath(orgPath);
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
+                if(sysOrganizationVoResultBean.getData() != null){
+                    finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
+                }
+                List<String> orgList = Arrays.asList(orgPath.split("/"));
+                orgList.set(orgList.size()-1,dto.getStaffDeptSid());
+                finCollectionConfirmation.setOrgSidPath(String.join("/",orgList));
+
             }
             sid = finCollectionConfirmation.getSid();
-            //根据用户sid查询分公司sid
-            String useOrgSid = "";
-            if (StringUtils.isNotBlank(dto.getOrgPath())) {
-                useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
-            } else {
-                useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-            }
+
             finCollectionConfirmation.setCreateBySid(dto.getUserSid());
             finCollectionConfirmation.setUseOrgSid(useOrgSid);
             //附件保存:打款凭证附件
@@ -476,10 +497,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     //认款日期默认为当天的日期
                     finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
 //                    finSelectedReceivablesDetailed.setBalance(v.getSubscriptionMoney());
+
+                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                    finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName());
+                    finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid());
+                    finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid());
+                    finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName());
+                    finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
+                    finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
                     finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
                     if (v.getSubscribedOf() == 0) {
                         //应收未收减去相应的认款
-                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                        finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                         BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                         finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                         finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
@@ -779,6 +808,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
         finCollectionConfirmation.setStaffDeptSid(createDeptSid);
         finCollectionConfirmation.setStaffDeptName(deptName);
+        String orgPath = dto.getOrgPath();
+        finCollectionConfirmation.setOrgSidPath(orgPath);
+        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(finCollectionConfirmation.getUseOrgSid());
+        if(sysOrganizationVoResultBean.getData() != null){
+            finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
+        }
         if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
             if (StringUtils.isBlank(dto.getCollectionBankNum())) {
                 return rb.setMsg("收款银行账号不能为空");
@@ -996,9 +1031,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid());
             finSelectedReceivablesDetailed.setSubscribedOf(paymentDetail.getSubscribedOf());
 //            finSelectedReceivablesDetailed.setBalance(paymentDetail.getConfirmMoney().toString());
+            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+            finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName());
+            finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid());
+            finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid());
+            finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName());
+            finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
+            finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
             finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
             if (paymentDetail.getSubscribedOf() == 0) {
-                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                 BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                 finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                 finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
@@ -2591,6 +2633,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
         finSelectedReceivablesDetailed.setPurchaseSystemSid(confirmation.getPurchaseSystemSid());
         finSelectedReceivablesDetailed.setPurchaseSystemName(confirmation.getPurchaseSystemName());
+        finSelectedReceivablesDetailed.setStaffName(confirmation.getStaffName());
+        finSelectedReceivablesDetailed.setStaffUserSid(confirmation.getStaffUserSid());
+        finSelectedReceivablesDetailed.setStaffDeptSid(confirmation.getStaffDeptSid());
+        finSelectedReceivablesDetailed.setStaffDeptName(confirmation.getStaffDeptName());
+        finSelectedReceivablesDetailed.setOrgSidPath(confirmation.getOrgSidPath());
+        finSelectedReceivablesDetailed.setUseOrgName(confirmation.getUseOrgName());
         finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
         if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
             //添加进附件表

From de9bd04f047bfa7b314774d2da79b1beb2170aee Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 1 Aug 2023 17:36:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9E=E7=90=86=E6=B7=BB=E5=8A=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/BusSalesOrderService.java   | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 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 8b709b7d4f..d64ee10a21 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
@@ -244,8 +244,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BusSalesOrderDepositService busSalesOrderDepositService;
     @Autowired
     private BusDepositFictitiousService busDepositFictitiousService;
-   /* @Autowired
-    private BusPurchaseChannelService busPurchaseChannelService;*/
+    /* @Autowired
+     private BusPurchaseChannelService busPurchaseChannelService;*/
     @Autowired
     private ScmPurchaseChannelFeign scmPurchaseChannelFeign;
     @Autowired
@@ -1315,7 +1315,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<String> initBigDecimalOneList = new ArrayList<>();
         //是否是现车//ToDo:促销政策
         if ("1".equals(busSalesOrder.getType())) {
-            if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
+            if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
                 //根据销售订单sid查询现车的sid集合
                 vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
                 //根据现车去查询销售政策的总促销政策之和
@@ -2407,9 +2407,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
             //查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
-                if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){
+                if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
                     orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
-                }else{
+                } else {
                     //类型为现车，查询该销售订单的现车车辆信息
                     List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
                     nowCarList.removeAll(Collections.singleton(null));
@@ -3478,7 +3478,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
             String topMessage = "";
-            if(busSalesOrderMakeup != null){
+            if (busSalesOrderMakeup != null) {
                 //颜色
                 if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
                     topMessage = topMessage + busSalesOrderMakeup.getColor();
@@ -5160,11 +5160,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
                 AppOrderDetailsVo vo = details.getData();
                 if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
-                    if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
+                    if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
                         //更新已选择的车架号的状态为销售订单锁定
                         List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
                         list.removeAll(Collections.singleton(null));
-                        if(!list.isEmpty()){
+                        if (!list.isEmpty()) {
                             BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
                             busMainDepositUpdateQuery.setVinSidList(list);
                             busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
@@ -5237,24 +5237,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //-----------------推送车款款项结束
                 //推送采购渠道待选择
-               /* ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
-                scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
-                scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
-                SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
-                scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
-                scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
-                scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
-                scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
-                BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
-                scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
-                scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
-                scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
-                scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
-                scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
-                scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
-                BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
-                scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
-                scmPurchaseChannelFeign.save(scmPurchaseChannelDto);*/
+                if ("3".equals(busSalesOrder.getType())) {
+                    ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
+                    scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
+                    scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
+                    SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                    scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
+                    scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
+                    scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
+                    scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
+                    BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
+                    scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
+                    scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
+                    scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
+                    scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
+                    scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                    scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
+                    scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
+                    scmPurchaseChannelFeign.save(scmPurchaseChannelDto);
+                }
+
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -6617,12 +6620,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             newSalesOrder.setContractNo(null);
             newSalesOrder.setCreateTime(createTime);
             newSalesOrder.setModifyTime(modifyTime);
-            if(StringUtils.isNotBlank(customerSid)){
+            if (StringUtils.isNotBlank(customerSid)) {
                 newSalesOrder.setCustomerSid(customerSid);
                 newSalesOrder.setCustomerName(customerName);
                 newSalesOrder.setMobile(customerMobile);
                 ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
-                if(crmCustomerTempVoResultBean.getData() != null){
+                if (crmCustomerTempVoResultBean.getData() != null) {
                     newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
                     newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
                 }
@@ -6888,7 +6891,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.fetchBySid(baseVehicleTempstate.getBusSid());
                 //根据合同和车辆查询该合同下是否还存在未提车的数据
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), baseVehicleTempstate.getVehSid());
-                if(busSalesOrderVehicle != null){
+                if (busSalesOrderVehicle != null) {
                     stringList.add(busSalesOrderVehicle.getSid());
                 }
 

From c89444d91f002aec3118069ebb49566e758bb3c0 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 1 Aug 2023 17:46:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96pc=E7=AB=AF=E5=BE=85?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=85=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
index 30a5ab972b..4bbce5aaf3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@@ -304,7 +304,7 @@
             busState = '401'
             AND ( finState = '1' OR carryVehicleState = 1 ))  AND bbv.vehicleState != '0002'
         </where>
-        order by bo.contractNo desc) a
+        order by bo.contractNo desc,bv.id desc) a
 
     </select>