From a927160d0c5941fa70c9c322c455e55f58643053 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 13:49:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
index 0a9f2e809b..9bc71ddd41 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
@@ -83,7 +83,7 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
     @ApiModelProperty("其他融贴息")
-    private String otherDiscount;
+    private BigDecimal otherDiscount;
 
 
 

From ca855c0b24d3786594c3bb2fe6b766bcbfef250c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 13:57:33 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/biz/loansolutions/LoanSolutionsService.java     | 3 +++
 1 file changed, 3 insertions(+)

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 43489c4cf3..6390ec3082 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
@@ -1608,6 +1608,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
     public static BigDecimal calculatePMT(double rate, double nper, double pv) {
         double v = (1 + (rate / 12));
         double t = (-(nper / nper) * nper);
+        if(rate == 0.0){
+            return BigDecimal.ZERO;
+        }
         double result = (pv * (rate / 12)) / (1 - Math.pow(v, t));
         return new BigDecimal(result);
     }

From 33beed65e8132b29c5aaaaf98e35137cc71676d8 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 16:21:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/biz/loansolutions/LoanSolutionsService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 6390ec3082..56e232d646 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
@@ -1322,10 +1322,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //根据年利率和期数、贷款金额计算月还
                 loanPayMoneyNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(loanPeriod).doubleValue(), loanAmount.doubleValue());
                 //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
-                loanInterestNew = loanPayMoney.multiply(new BigDecimal(loanPeriod)).subtract(loanAmount);
+                loanInterestNew = loanPayMoneyNew.multiply(new BigDecimal(loanPeriod)).subtract(loanAmount);
                 //四舍五入取整数
-                loanPayMoneyNew = loanPayMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
-                loanInterestNew = loanInterest.setScale(0, BigDecimal.ROUND_HALF_UP);
+                loanPayMoneyNew = loanPayMoneyNew.setScale(0, BigDecimal.ROUND_HALF_UP);
+                loanInterestNew = loanInterestNew.setScale(0, BigDecimal.ROUND_HALF_UP);
                 loanPayMoneyAll = loanPayMoneyAll.add(loanPayMoneyNew);
                 policyYearRatioNew = BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP);
             }else{

From 37fa92cdbed9b9095bb61ae18037c699836b0ce6 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 16:32:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loansolutions/LoanSolutionsService.java          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 56e232d646..2bfe064f72 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
@@ -1320,7 +1320,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             policyYearRatioNew = policyYearRatioNew.setScale(2, BigDecimal.ROUND_HALF_UP);
             if(policyYearRatioNew.compareTo(BigDecimal.ZERO)<0){
                 //根据年利率和期数、贷款金额计算月还
-                loanPayMoneyNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(loanPeriod).doubleValue(), loanAmount.doubleValue());
+//                loanPayMoneyNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(loanPeriod).doubleValue(), loanAmount.doubleValue());
+                loanPayMoneyNew = loanAmount.divide(new BigDecimal(loanPeriod),4,BigDecimal.ROUND_CEILING);
                 //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
                 loanInterestNew = loanPayMoneyNew.multiply(new BigDecimal(loanPeriod)).subtract(loanAmount);
                 //四舍五入取整数
@@ -1392,7 +1393,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 otherPolicyYearRatioNew = otherPolicyYearRatioNew.setScale(2, BigDecimal.ROUND_HALF_UP);
                 if(otherPolicyYearRatioNew.compareTo(BigDecimal.ZERO)<0){
                     //根据年利率和期数、贷款金额计算月还
-                    otherPolicyMonthlyRepayNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
+//                    otherPolicyMonthlyRepayNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
+                    otherPolicyMonthlyRepayNew = new BigDecimal(otherPolicyAmount).divide(new BigDecimal(otherPolicyPeriod),4,BigDecimal.ROUND_CEILING);
                     //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
                     otherPolicyInterestNew = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
                     //四舍五入取整数
@@ -1608,9 +1610,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
     public static BigDecimal calculatePMT(double rate, double nper, double pv) {
         double v = (1 + (rate / 12));
         double t = (-(nper / nper) * nper);
-        if(rate == 0.0){
-            return BigDecimal.ZERO;
-        }
         double result = (pv * (rate / 12)) / (1 - Math.pow(v, t));
         return new BigDecimal(result);
     }

From 61257ecc06f6a586ac1e27d673d8c0b4b6e0ae63 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 16:35:57 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/biz/loansolutions/LoanSolutionsService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2bfe064f72..b4043b8af6 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
@@ -1396,7 +1396,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
 //                    otherPolicyMonthlyRepayNew = calculatePMT(BigDecimal.ZERO.divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
                     otherPolicyMonthlyRepayNew = new BigDecimal(otherPolicyAmount).divide(new BigDecimal(otherPolicyPeriod),4,BigDecimal.ROUND_CEILING);
                     //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
-                    otherPolicyInterestNew = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
+                    otherPolicyInterestNew = otherPolicyMonthlyRepayNew.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
                     //四舍五入取整数
                     otherPolicyMonthlyRepayNew = otherPolicyMonthlyRepayNew.setScale(0, BigDecimal.ROUND_HALF_UP);
                     otherPolicyInterestNew = otherPolicyInterestNew.setScale(0, BigDecimal.ROUND_HALF_UP);

From b6124e649114816d7797f0fb0b98ee2e31175b5c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 7 Oct 2023 16:47:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/biz/loansolutions/LoanSolutionsService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b4043b8af6..e1195961dc 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
@@ -1380,7 +1380,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String otherDiscount = query.getOtherDiscount();
             if (StringUtils.isNotBlank(otherDiscount) && !"0".equals(otherDiscount)) {
                 //根据年利率和期数、贷款金额计算旧月还
-                BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyYearRatio).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(loanPeriod).doubleValue(), loanAmount.doubleValue());
+                BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyYearRatio).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
                 //根据月还计算旧利息总额=旧月还金额 乘以 期数 减去 本金
                 BigDecimal otherPolicyInterest = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
                 //根据旧利息总额和厂家贴息计算新利息总额