From b8c430c32842f75f4b56d3d6f0a329e8e0f20fb7 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 22 Dec 2023 14:40:20 +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

---
 .../FinFundsCarriedForwardApplyService.java   | 49 +++++++++++++------
 ...inUncollectedReceivablesDetailedMapper.xml |  4 +-
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
index f9463da2d3..c1f0d39068 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
@@ -1618,23 +1618,40 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         if (!finSelectedReceivablesDetailedVos.isEmpty()) {
             for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
-                //查询该车的所有认款，是否都已认完
-                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
-                    //已认款完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
-                } else {
-                    //认款未完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
+                if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
+                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
+                }else{
+                    //查询该车的所有认款，是否都已认完
+                    String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
                 }
-
             }
 
         }
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 88e8bf784b..492bb49391 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
@@ -317,13 +317,13 @@
     </select>
 
     <select id="selectByBusVinSid" resultType="java.lang.String">
-        select sum(reveivableMoney)
+        select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid}
     </select>
 
     <select id="selectByBusVinSid1" resultType="java.lang.String">
-        select sum(reveivableMoney)
+        select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
     </select>