From 1516f464f5c604377ef0b46b07334d4ae9c54296 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 29 May 2025 10:29:31 +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

---
 .../api/loansettleapply/LoanSettleApplyDetailsVo.java       | 2 --
 .../api/loansettlecompanycost/LoanSettleCompanyCost.java    | 2 ++
 .../api/loansettlecompanycost/LoanSettleCompanyCostVo.java  | 2 ++
 .../biz/loanrepurchaseapply/LoanRepurchaseApplyService.java | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

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 4dcfd9c747..c3ccfd967e 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,6 +94,4 @@ public class LoanSettleApplyDetailsVo {
     private String buyBackMoney;
     @ApiModelProperty("是否有结清确认按钮")
     private boolean confirmAtn;
-    @ApiModelProperty("当前公司结清合计")
-    private String settleAll2;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java
index da280abeeb..3543891ed7 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java
@@ -44,6 +44,8 @@ public class LoanSettleCompanyCost extends BaseEntity {
     private BigDecimal settleAll;
     @ApiModelProperty("截止当前资金占用费")
     private BigDecimal fundAll;
+    @ApiModelProperty("当前公司结清合计")
+    private BigDecimal settleAll2;
 
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java
index b8b995a0a5..edff206446 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java
@@ -42,4 +42,6 @@ public class LoanSettleCompanyCostVo {
 
     @ApiModelProperty("截止当前资金占用费")
     private String fundAll;
+    @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 a6f76583c4..1f1bd4e979 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
@@ -1436,7 +1436,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 amount = overDueMonthPrice.add(currentNotDuePrice).add(notDuePrice);
             }
             loanSettleApplyDetailsVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
-            loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
+
             loanSettleApplyDetailsVo.setShowHg(true);
             loanSettleApplyDetailsVo.setBusSid(sid);
             //当前公司结清合计：回购申请的公司正常结清合计-回购后的月还款金额+（截止当前资金占用费-原回购申请的资金占用费）
@@ -1453,8 +1453,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             if(StringUtils.isNotBlank(companyCostVo.getFunfCost())){
                 settlyAll2 = settlyAll2.subtract(new BigDecimal(companyCostVo.getFunfCost()));
             }
-            loanSettleApplyDetailsVo.setSettleAll2(settlyAll2.toString());
-
+            loanSettleCompanyCostVo.setSettleAll2(settlyAll2.toString());
+            loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }