From 8faf7c76655a3feb1e8a798ca846c2c5147f296c Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 23 Feb 2024 16:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D=E8=AE=A4?=
 =?UTF-8?q?=E6=AC=BE=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     | 46 ++-----------------
 ...ncollectedReceivablesDetailedJRMapper.java |  2 +-
 ...UncollectedReceivablesDetailedJRMapper.xml |  2 +-
 ...collectedReceivablesDetailedJRService.java |  4 +-
 4 files changed, 7 insertions(+), 47 deletions(-)

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 f3aad57a06..1d13d2b060 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
@@ -3582,7 +3582,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
                                 rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
                             }
-                            String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
+                            String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
                             if (StringUtils.isNotBlank(noReturnMoney)) {
                                 rsk.setNoReceivableMoney(noReturnMoney);
                             }
@@ -3597,46 +3597,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 rsk.setAuditState(String.valueOf(v.getAuditState()));
                 rskList.add(rsk);
             }
-//            finSelectedReceivablesDetailedVos.stream().forEach(v -> {
-//                FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk();
-//                String receivablesSid = v.getReceivablesSid();
-//                if (v.getReceivablesName().equals("月还")) {
-//                    LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData();
-//                    if (null != data) {
-//                        BeanUtil.copyProperties(data, rsk, "sid");
-//                        if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
-//                            rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
-//                        }
-//                        String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid);
-//                        if (StringUtils.isNotBlank(noReturnMoney)) {
-//                            rsk.setNoReceivableMoney(noReturnMoney);
-//                        }
-//                    }
-//                } else {
-//                    FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid);
-//                    if (jr != null) {
-//                        String busSid = jr.getBusSid();
-//                        LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData();
-//                        if (null != data) {
-//                            BeanUtil.copyProperties(data, rsk, "sid");
-//                            if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
-//                                rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
-//                            }
-//                            String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid);
-//                            if (StringUtils.isNotBlank(noReturnMoney)) {
-//                                rsk.setNoReceivableMoney(noReturnMoney);
-//                            }
-//                        }
-//                    }
-//                }
-//                rsk.setCurrentReceivableMoney(v.getCurrentReceivableMoney());
-//                rsk.setReceivablesName(v.getReceivablesName());
-//                rsk.setSid(v.getSid());
-//                rsk.setSubscriptionMoney(v.getSubscriptionMoney());
-//                rsk.setReceivablesSid(v.getReceivablesSid());
-//                rsk.setAuditState(String.valueOf(v.getAuditState()));
-//                rskList.add(rsk);
-//            });
         }
         finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(rskList);
         if (finCollectionConfirmation.getAuditState() == 2) {
@@ -4590,7 +4550,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         rsk.setVin(data.getVinNo());
                                     }
                                 }
-                                String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
+                                String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
                                 if (StringUtils.isNotBlank(noReturnMoney)) {
                                     rsk.setNoReceivable(new BigDecimal(noReturnMoney));
                                 }
@@ -4828,7 +4788,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         rsk.setVin(data.getVinNo());
                                     }
                                 }
-                                String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
+                                String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
                                 if (StringUtils.isNotBlank(noReturnMoney)) {
                                     rsk.setResidueMoney(new BigDecimal(noReturnMoney));
                                 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
index 00605d8522..5ca233cc3f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
@@ -80,7 +80,7 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper<Fi
 
     String selNoReturnMoneyRsk(@Param("planSid") String planSid);
 
-    String selNoReturnMoneyJR(@Param("planSid") String planSid,@Param("name") String name);
+    String selNoReturnMoneyJR(@Param("planSid") String planSid,@Param("sid") String sid);
 
     List<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsListForRule( @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedRskVo> qw,
                                                                                      @Param("userOrgSid") String userOrgSid,
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
index d7adf49b1c..e5b9b950f5 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
@@ -263,7 +263,7 @@
                      LEFT JOIN anrui_riskcenter.loan_repayment_plan_details AS p ON jr.busSid = p.sid
              WHERE
                  p.sid = #{planSid}
-               AND jr.payCostTitleValue = #{name}) as a
+               AND jr.sid = #{sid}) as a
 
     </select>
     <select id="getRskPaymentDetailsListForRule"
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
index 2c280afcac..32801bd936 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
@@ -116,8 +116,8 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
         return baseMapper.selNoReturnMoneyRsk(planSid);
     }
 
-    public String selNoReturnMoneyJR(String planSid,String name) {
-        return baseMapper.selNoReturnMoneyJR(planSid,name);
+    public String selNoReturnMoneyJR(String planSid,String sid) {
+        return baseMapper.selNoReturnMoneyJR(planSid,sid);
     }