From 86aaac2642cb1cd050af414554f13daa16f31efb Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 May 2025 14:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java | 4 ++--
 .../api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java | 3 ++-
 .../LoanRepurchaseApplyFeignFallback.java                 | 2 +-
 .../biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java  | 4 ++--
 .../loanrepurchaseapply/LoanRepurchaseApplyService.java   | 8 +++++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 2a78b4bce9..4874182715 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -617,7 +617,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                         if (null != manufacturerBank) {
                             payTypeCode = manufacturerBank.getDueBankKey();
                         }
-                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber);
+                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber,finPaymentrecord.getCost().toString());
                     }else{
                         if (StringUtils.isNotBlank(finPaymentrecord.getPayBankAccount())) {
                             String shouxufei = "0";
@@ -999,7 +999,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                         if (null != manufacturerBank) {
                             payTypeCode = manufacturerBank.getDueBankKey();
                         }
-                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber);
+                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber,finPaymentrecord.getCost().toString());
                     }else{
                         if (StringUtils.isNotBlank(finPaymentrecord.getPayBankAccount())) {
                             String shouxufei = "0";
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java
index 8489f23c29..a797918002 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java
@@ -18,6 +18,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -120,5 +121,5 @@ public interface LoanRepurchaseApplyFeign {
     @ApiOperation("回购付款凭证推送")
     @PostMapping("/pushRiskToFin")
     @ResponseBody
-    ResultBean pushRiskToFin(@RequestParam("applySid") String applySid,@RequestParam("payTypeCode")String payTypeCode,@RequestParam("accountNumber")String accountNumber);
+    ResultBean pushRiskToFin(@RequestParam("applySid") String applySid, @RequestParam("payTypeCode")String payTypeCode, @RequestParam("accountNumber")String accountNumber, @RequestParam("cost")String cost);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java
index 023df2ec28..2157476331 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java
@@ -104,7 +104,7 @@ public class LoanRepurchaseApplyFeignFallback implements LoanRepurchaseApplyFeig
     }
 
     @Override
-    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber) {
+    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber,String cost) {
         return null;
     }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java
index cc1a764ea8..d71111ad57 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java
@@ -126,9 +126,9 @@ public class LoanRepurchaseApplyRest implements LoanRepurchaseApplyFeign {
     }
 
     @Override
-    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber) {
+    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber,String cost) {
         ResultBean rb = ResultBean.fireFail();
-        loanRepurchaseApplyService.pushRiskToFin(applySid,payTypeCode,accountNumber);
+        loanRepurchaseApplyService.pushRiskToFin(applySid,payTypeCode,accountNumber,cost);
         return rb.success();
     }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
index 821c8819d3..7037f667f6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
@@ -834,14 +834,17 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         }
     }
     @Transactional(rollbackFor = Exception.class)
-    public void pushRiskToFin(String businessSid,String payTypeCode,String accountNumber){
+    public void pushRiskToFin(String businessSid,String payTypeCode,String accountNumber,String cost){
         LoanRepurchaseApply loanRepurchaseApply = fetchBySid(businessSid);
         LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(businessSid);
         //查询月还明细表，遍历
         List<LoanRepaymentPlanDetails> list = loanRepaymentPlanDetailsService.selectByBusVinSid2(loanRepurchaseApply.getBusVinSid());
         list.removeAll(Collections.singleton(null));
         if(!list.isEmpty()){
-            BigDecimal bankSettlePrice = loanRepurchaseCost.getBankSettlePrice();
+            BigDecimal bankSettlePrice = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(cost)){
+                bankSettlePrice = new BigDecimal(cost);
+            }
             if(bankSettlePrice != null && bankSettlePrice.compareTo(BigDecimal.ZERO)>0){
                 for (int jj = 0; jj < list.size(); jj++) {
                     LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(jj);
@@ -858,7 +861,6 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                             loanRepaymentPlanDetails.setPaymentMoney(paymentMoney);
                             loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails);
                         }else{
-                            bankSettlePrice = BigDecimal.ZERO;
                             BigDecimal paymentMoney = loanRepaymentPlanDetails.getPaymentMoney();
                             if(paymentMoney != null){
                                 paymentMoney = paymentMoney.add(bankSettlePrice);