From 99816976cd7c1cdb35bb6da7d120466146d61a80 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 23 Feb 2024 15:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E5=87=8F=E5=9E=AB?=
 =?UTF-8?q?=E6=AC=BE=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentHistoryMapper.java                  |  2 ++
 .../LoanRepaymentHistoryMapper.xml                   | 12 ++++++++++++
 .../LoanRepaymentHistoryService.java                 | 10 +++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
index 88ae7f2ea7..afa5959052 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
@@ -53,4 +53,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     String getMaxUpdateTimeByBankContractNo(@Param("bankContractNo") String bankContractNo);
 
     TransferRecordVo selTransferRecord(@Param("sid") String sid);
+
+    String getUpdateMoneyBySid(@Param("pSid") String pSid,@Param("histories") List<String> histories);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index f8c2ace9d8..d97532c0ec 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -445,5 +445,17 @@
         where r.repaymentHistorySid = #{sid}
           and r.state = 1
     </select>
+    <select id="getUpdateMoneyBySid" resultType="java.lang.String">
+        SELECT
+            IFNULL(SUM(h.actualMoney),0)
+        FROM
+            loan_repayment_history AS h
+        WHERE
+            h.planDetailSid = #{pSid}
+          AND h.sid IN
+        <foreach collection="histories" item="histories" index="index" open="(" close=")" separator=",">
+            #{histories}
+        </foreach>
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index 11a7945a44..a62f55b179 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -766,14 +766,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                                 if (StringUtils.isNotBlank(difference.getDifference())) {
                                     BigDecimal amount = new BigDecimal(difference.getDifference());
                                     if (amount.compareTo(BigDecimal.ZERO) > 0) {
+                                        //查询更新金额
+                                        String money = baseMapper.getUpdateMoneyBySid(pSid,histories);
+                                        BigDecimal decimalMoney = new BigDecimal(money);
                                         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(pSid);
-                                        planDetails.setPaymentMoney(planDetails.getPaymentMoney().subtract(amount));
+                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                        planDetails.setPaymentMoney(paymentMoney.subtract(decimalMoney));
                                         loanRepaymentPlanDetailsService.updateById(planDetails);
                                         //生成平台资方退还垫款
                                         FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                                         jr.setBusSid(planDetails.getSid());
-                                        jr.setCurrentReceivableMoney(amount);
-                                        jr.setReveivableMoney(amount);
+                                        jr.setCurrentReceivableMoney(decimalMoney);
+                                        jr.setReveivableMoney(decimalMoney);
                                         jr.setPayCostTitleKey("007");
                                         jr.setPayCostTitleValue("资方退还垫款");
                                         jr.setOrgSidPath(planDetails.getOrgSidPath());