From 729f337c21c70daf0ac84b2fdfc4d81794391f5c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 4 Jun 2025 14:03:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B4=AD?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=87=AD=E8=AF=81=E4=B8=AA=E8=B4=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=93=B6=E8=A1=8C=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loanrepurchaseapply/LoanRepurchaseApplyService.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

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 6f1add3831..c4e8631ce3 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
@@ -47,6 +47,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto;
@@ -61,6 +62,7 @@ import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
 import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService;
@@ -150,6 +152,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     private FinPaymentrecordFeign finPaymentrecordFeign;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanFinBankService loanFinBankService;
 
     public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
         IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
@@ -937,6 +941,10 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                     voucherResultDetailDtoDf.setSummary(loanRepurchaseApply.getBankName() + "个贷保证金抵结清款");
                     voucherResultDetailDtoDf.setSubjectNo("1009.01.00");
+                    LoanFinBank loanFinBank = loanFinBankService.fetchBySid(loanRepurchaseApply.getBankSid());
+                    if(loanFinBank != null){
+                        voucherResultDetailDtoDf.setBank(loanFinBank.getBankNo());
+                    }
                     //核算部门
                     voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户

From 371bfc7dd35f7b1a729a19741188e0a3c54a4f6f Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 4 Jun 2025 14:11:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E8=AF=89=E8=AE=BC=E7=AE=A1=E7=90=86=E9=80=9A=E8=BF=87=E5=90=8E?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AEnull=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanlawsuitapply/LoanLawsuitApplyService.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
index ce260605fc..011d82c1ba 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
@@ -718,8 +718,10 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
                     pushCaseDto.setVehList(vehList);
                 }
                 LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(lawsuitApply.getLoanSid());
-                pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
-                pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               if(loanHomevisitInvestigateCustomerDetailsVo != null){
+                   pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
+                   pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               }
                 pushCaseDto.setIsZfull("0");
                 loanCaseProgressService.pushCase(pushCaseDto);
             } else {

From 91717fb153a0efe2d482af50ed90d84daa40c59e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 4 Jun 2025 15:18:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanrepurchaseapply/LoanRepurchaseApplyService.java      | 1 +
 1 file changed, 1 insertion(+)

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 c4e8631ce3..6bab3c5d8c 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
@@ -871,6 +871,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                             }else{
                                 paymentMoney = bankSettlePrice;
                             }
+                            bankSettlePrice = bankSettlePrice.subtract(bankSettlePrice);
                             loanRepaymentPlanDetails.setPaymentMoney(paymentMoney);
                             loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails);
                         }