From 755a7341f2635ee2cf36929ab72a1b2d0aa8c079 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 29 May 2025 09:21:24 +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

---
 .../LoanSettleApplyDetailsVo.java                |  2 ++
 .../LoanRepurchaseApplyService.java              | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
index c3ccfd967e..4dcfd9c747 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
@@ -94,4 +94,6 @@ public class LoanSettleApplyDetailsVo {
     private String buyBackMoney;
     @ApiModelProperty("是否有结清确认按钮")
     private boolean confirmAtn;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
 }
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 7037f667f6..a6f76583c4 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
@@ -1439,6 +1439,22 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
             loanSettleApplyDetailsVo.setShowHg(true);
             loanSettleApplyDetailsVo.setBusSid(sid);
+            //当前公司结清合计：回购申请的公司正常结清合计-回购后的月还款金额+（截止当前资金占用费-原回购申请的资金占用费）
+            BigDecimal settlyAll2 = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(companyCostVo.getSettleAll())){
+                settlyAll2 = settlyAll2.add(new BigDecimal(companyCostVo.getSettleAll()));
+            }
+            if(StringUtils.isNotBlank(loanSettleApplyDetailsVo.getBuyBackMoney())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(loanSettleApplyDetailsVo.getBuyBackMoney()));
+            }
+            if(StringUtils.isNotBlank(fundAll)){
+                settlyAll2 = settlyAll2.add(new BigDecimal(fundAll));
+            }
+            if(StringUtils.isNotBlank(companyCostVo.getFunfCost())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(companyCostVo.getFunfCost()));
+            }
+            loanSettleApplyDetailsVo.setSettleAll2(settlyAll2.toString());
+
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }