From 2e289af9a8b27ff022761c15b26064d96dfdf9f3 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 19 May 2023 17:04:46 +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

---
 .../BusArrearsCarryVehicleApplyService.java                | 1 +
 .../FinCollectionConfirmationService.java                  | 6 +++++-
 .../FinUncollectedReceivablesDetailedMapper.xml            | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
index eb99391500..ba91b4598f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
@@ -1784,6 +1784,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 if (vehicleDetailsVos.size() > 0) {
                     for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) {
                         BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
+                        busDeliveredDto.setCreateBySid(busArrearsCarryVehicleApply.getCreateBySid());
                         busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
                         busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
                         busDeliveredDto.setPaymentMethodKey(busArrearsCarryVehicleApply.getPaymentMethodKey());
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 9d10f5e13f..1b2767d7b9 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
@@ -1305,7 +1305,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         arReceivebill.setF_PAEZ_AssistantKey("002");
                     }
                     arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
-                    if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0) {
+                    if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1_1.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1.size() == 0
+                    && finSelectedReceivablesDetailedVos2_1.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
                         arReceivebill.setFBillNo(confirmation.getBillNo());
                     } else {
                         carSize = carSize + 1;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
index 4f0ef61027..8285c2d90b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@@ -150,10 +150,13 @@
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">
-        select distinct fun.busVinSid
+        select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
+        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.createBySid = #{userSid}
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
+        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
+        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
     </select>
     <select id="selectSidBybusVinSidAndConNo" resultType="java.lang.String">