From d14415cd2479787bd1aa9d86c28a172e76e5c92e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 8 Nov 2023 11:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/SolutionsDetailsssVo.java   |  5 +++++
 .../api/loansolutions/LoanSolutions.java      |  5 +++--
 .../api/loansolutions/SolutionDetailsDto.java |  5 +++++
 .../loansolutions/app/SolutionsDetailsVo.java |  5 +++++
 .../api/loansolutions/app/SolutionssDto.java  |  5 +++++
 .../api/loansolutions/app/SolutionssVo.java   |  5 +++++
 .../loansolutions/calculate/CalculateVo.java  |  5 +++++
 .../loansolutions/LoanSolutionsService.java   | 20 +++++++++++++++++++
 .../api/risk/solutions/AppSolutionVo.java     |  5 +++++
 .../risk/solutions/AppSolutionsDetailsVo.java |  5 +++++
 .../api/risk/solutions/AppSolutionssDto.java  |  5 +++++
 11 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
index a793b8c84f..3ebb5b6529 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
@@ -168,4 +168,9 @@ public class SolutionsDetailsssVo {
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java
index 6e20477bfa..28c011e27c 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java
@@ -67,8 +67,7 @@ public class LoanSolutions extends BaseEntity {
     private BigDecimal bondAmount;
     @ApiModelProperty("厂家贴息")
     private BigDecimal factoryDiscount;
-    @ApiModelProperty("实际贴息")
-    private BigDecimal actualDiscount;
+
     @ApiModelProperty("厂家贴息用途")
     private String factoryDiscountUse;
     @ApiModelProperty("厂家贴息用途")
@@ -96,6 +95,8 @@ public class LoanSolutions extends BaseEntity {
     private int saleOrderState;
     @ApiModelProperty("贴息抵车款")
     private BigDecimal discountCar;
+    @ApiModelProperty("实际贴息")
+    private BigDecimal actualDiscount;
 
 
 
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
index ed90f34560..85c33e7a6b 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
@@ -165,5 +165,10 @@ public class SolutionDetailsDto implements Dto {
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
index 697cc1210f..cd45aee7b1 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
@@ -184,5 +184,10 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("服务费")
     private String serviceChargeTypeValue;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
index 8ca5da3eef..e75f8b6b4e 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
@@ -164,4 +164,9 @@ public class SolutionssDto implements Dto {
     private String vehTotalPrice;
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
+
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
index 3cf6646b00..e4d4ef29cc 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
@@ -175,5 +175,10 @@ public class SolutionssVo implements Vo {
 
     private String modelSid;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
index 3136487ac8..43dd99af79 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
@@ -59,5 +59,10 @@ public class CalculateVo {
     @ApiModelProperty("车辆总价")
     private String vehTotalPrice;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index faa6f73c3b..c04aea3c1b 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -1326,14 +1326,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //根据产品政策查询原利率
         LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(policySid);
         if (StringUtils.isNotBlank(factoryDiscount) && !"0".equals(factoryDiscount)) {
+            BigDecimal actualDiscount = BigDecimal.ZERO;
             //年利率
             BigDecimal policyYearRatio = loanFinPolicy.getYearRatio();
             //根据年利率和期数、贷款金额计算旧月还
             BigDecimal loanPayMoney = calculatePMT(policyYearRatio.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(loanPeriod).doubleValue(), loanAmount.doubleValue());
             //根据月还计算旧利息总额=旧月还金额 乘以 期数 减去 本金
             BigDecimal loanInterest = loanPayMoney.multiply(new BigDecimal(loanPeriod)).subtract(loanAmount);
+            actualDiscount = actualDiscount.add(loanInterest);
             //根据旧利息总额和厂家贴息计算新利息总额
             BigDecimal loanInterestNew = loanInterest.subtract(new BigDecimal(factoryDiscount));
+            actualDiscount = actualDiscount.subtract(loanInterestNew);
             //再根据厂家贴息、旧月还计算新月还金额 = 旧月还金额 减去 厂家贴息 除以 期数
             BigDecimal loanPayMoneyNew = loanPayMoney.subtract(new BigDecimal(factoryDiscount).divide(new BigDecimal(loanPeriod), 4, BigDecimal.ROUND_HALF_UP));
             //根据新月还rate计算新年利率。
@@ -1361,6 +1364,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             calculateVo.setLoanInterest(loanInterestNew.toString());
             calculateVo.setPolicyYearRatio(policyYearRatioNew.toString());
             calculateVo.setLoanPayMoney(loanPayMoneyNew.toString());
+            String actualDiscountString = actualDiscount.setScale(0, BigDecimal.ROUND_HALF_UP).toString();
+            calculateVo.setActualDiscount(actualDiscountString);
         } else {
             //年利率
             BigDecimal policyYearRatio = loanFinPolicy.getYearRatio();
@@ -1406,6 +1411,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //其他融贴息
             String otherDiscount = query.getOtherDiscount();
             if (StringUtils.isNotBlank(otherDiscount) && !"0".equals(otherDiscount)) {
+                BigDecimal otherActualDiscount = BigDecimal.ZERO;
                 loanDownPay = loanDownPay.subtract(new BigDecimal(otherPolicyAmount));
                 //总贷款金额的计算
                 loanAmountTotal = loanAmountTotal.add(new BigDecimal(otherPolicyAmount));
@@ -1418,8 +1424,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 }
                 //根据月还计算旧利息总额=旧月还金额 乘以 期数 减去 本金
                 BigDecimal otherPolicyInterest = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
+                otherActualDiscount = otherActualDiscount.add(otherPolicyInterest);
                 //根据旧利息总额和厂家贴息计算新利息总额
                 BigDecimal otherPolicyInterestNew = otherPolicyInterest.subtract(new BigDecimal(otherDiscount));
+                otherActualDiscount = otherActualDiscount.subtract(otherPolicyInterestNew);
                 //再根据厂家贴息、旧月还计算新月还金额 = 旧月还金额 减去 厂家贴息 除以 期数
                 BigDecimal otherPolicyMonthlyRepayNew = otherPolicyMonthlyRepay.subtract(new BigDecimal(otherDiscount).divide(new BigDecimal(otherPolicyPeriod), 4, BigDecimal.ROUND_HALF_UP));
                 //根据新月还rate计算新年利率。
@@ -1447,6 +1455,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 calculateVo.setOtherPolicyInterest(otherPolicyInterestNew.toString());
                 calculateVo.setOtherPolicyYearRatio(otherPolicyYearRatioNew.toString());
                 calculateVo.setOtherPolicyMonthlyRepay(otherPolicyMonthlyRepayNew.toString());
+                String otherActualDiscountString = otherActualDiscount.setScale(0, BigDecimal.ROUND_HALF_UP).toString();
+                calculateVo.setOtherActualDiscount(otherActualDiscountString);
             } else {
                 loanDownPay = loanDownPay.subtract(new BigDecimal(otherPolicyAmount));
                 //总贷款金额的计算
@@ -1996,6 +2006,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             StringBuilder factoryDiscountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getFactoryDiscount())) {
                 factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append(solutionssVo.getFactoryDiscount());
+                if(StringUtils.isNotBlank(solutionssVo.getActualDiscount())){
+                    if(new BigDecimal(solutionssVo.getActualDiscount()).compareTo(BigDecimal.ZERO) != 0){
+                        factoryDiscountValue = factoryDiscountValue.append("(实贴").append(solutionssVo.getActualDiscount()).append(")");
+                    }
+                }
             } else {
                 factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append("-");
             }
@@ -2095,6 +2110,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 StringBuilder otherDiscountValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionssVo.getOtherDiscount())) {
                     otherDiscountValue = otherDiscountValue.append("其它融贴息：").append(solutionssVo.getOtherDiscount());
+                    if(StringUtils.isNotBlank(solutionssVo.getOtherActualDiscount())){
+                        if(new BigDecimal(solutionssVo.getOtherActualDiscount()).compareTo(BigDecimal.ZERO) != 0){
+                            otherDiscountValue = otherDiscountValue.append("(实贴").append(solutionssVo.getOtherActualDiscount()).append(")");
+                        }
+                    }
 
                 } else {
                     otherDiscountValue = otherDiscountValue.append("其它融贴息：").append("-");
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
index ea1b5159d9..bed01a8b9d 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
@@ -209,5 +209,10 @@ public class AppSolutionVo {
 
     private String modelSid;
 
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
index 1f31c637de..8c9c89d1be 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
@@ -182,4 +182,9 @@ public class AppSolutionsDetailsVo implements Vo {
 
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
+
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
index e8fe3c2a3d..68904f6c4d 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
@@ -167,4 +167,9 @@ public class AppSolutionssDto implements Dto {
     private String vehTotalPrice;
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
+
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
 }