From 642afb6b75aa0392882c70a69417b07ba1b9c445 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 29 May 2025 10:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=9B=9E=E8=B4=AD?=
 =?UTF-8?q?=E7=BB=93=E6=B8=85=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/loansettleapply/SettleApplyAppVo.java |  7 +++
 .../LoanSettleApplyService.java               | 44 +++++++++++++++++--
 .../risk/settleapply/SettleApplyAppVos.java   |  7 +++
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java
index 9e1a953a62..2b52483c63 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java
@@ -140,4 +140,11 @@ public class SettleApplyAppVo {
     private String notDuePriceRelief;
     @ApiModelProperty("减免依据")
     private String reliefBasis;
+
+    @ApiModelProperty("回购后还款金额")
+    private String buyBackMoney;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
+    @ApiModelProperty("备注")
+    private String remarks;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index f95b81a52c..5f9976bd92 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -3581,9 +3581,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (loanSettleCompanyCost.getSettleAll() != null) {
                 settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
             }
-            if (loanSettleCompanyCost.getFundAll() != null) {
-                settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
-            }
             if (StringUtils.isNotBlank(loanSettleCompanyCost.getOtherCostRemarks())) {
                 settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
             }
@@ -3629,6 +3626,47 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         } else {
             settleApplyAppVo.setTrueHg(false);
         }
+        if(settleApplyAppVo.isTrueHg()){//是回购的话
+            //回购后的还款金额：回购申请中的（公司逾期月还+公司当前未还月还+公司未到期月还）-当前结清申请中的公司（公司逾期月还+公司当前未还月还+公司未到期月还）
+            BigDecimal overDueMonthPriceBack = new BigDecimal(0);
+            BigDecimal currentNotDuePriceBack = new BigDecimal(0);
+            BigDecimal notDuePriceBack = new BigDecimal(0);
+            BigDecimal amountBack = new BigDecimal(0);
+            if (null != loanSettleApply.getOverdueMonthPrice()) {
+                overDueMonthPriceBack = loanSettleApply.getOverdueMonthPrice();
+            }
+            if (null != loanSettleApply.getCurrentNotDuePrice()) {
+                currentNotDuePriceBack = loanSettleApply.getCurrentNotDuePrice();
+            }
+            if (null != loanSettleApply.getNotDuePrice()) {
+                notDuePriceBack = loanSettleApply.getNotDuePrice();
+            }
+            amountBack = overDueMonthPriceBack.add(currentNotDuePriceBack).add(notDuePriceBack);
+            BigDecimal overDueMonthPrice = new BigDecimal(0); //回购申请中正常合计
+            BigDecimal currentNotDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal notDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal amount = new BigDecimal(0);
+            SettleApplyCommonVo settleApplyCommonVo = getInfo(loanSettleApply.getBusVinSid(), loanSettleApply.getSettingDate());
+            if (null != settleApplyCommonVo) {
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getOverdueMonthPrice())) {
+                    overDueMonthPrice = new BigDecimal(settleApplyCommonVo.getOverdueMonthPrice());
+                }
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getCurrentNotDuePrice())) {
+                    currentNotDuePrice = new BigDecimal(settleApplyCommonVo.getCurrentNotDuePrice());
+                }
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getNotDuePrice())) {
+                    notDuePrice = new BigDecimal(settleApplyCommonVo.getNotDuePrice());
+                }
+                amount = overDueMonthPrice.add(currentNotDuePrice).add(notDuePrice);
+            }
+            settleApplyAppVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
+            if(loanSettleCompanyCost.getSettleAll2() != null){
+                settleApplyAppVo.setSettleAll2(loanSettleCompanyCost.getSettleAll2().toString());
+            }
+            if (loanSettleCompanyCost.getFundAll() != null) {
+                settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
+            }
+        }
 
         return rb.success().setData(settleApplyAppVo);
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java
index 43a869b3d0..0e43e685f3 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java
@@ -143,4 +143,11 @@ public class SettleApplyAppVos {
     private String notDuePriceRelief;
     @ApiModelProperty("减免依据")
     private String reliefBasis;
+
+    @ApiModelProperty("回购后还款金额")
+    private String buyBackMoney;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
+    @ApiModelProperty("备注")
+    private String remarks;
 }