From ee5278bf1af3b23a5f04479813e4f7e1dd842a27 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 5 Sep 2023 13:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/loantemplate/AppLoanTemplateVo.java         |  2 ++
 .../biz/loansolutions/LoanSolutionsService.java     | 13 +++++++++----
 .../biz/loantemplate/LoanTemplateMapper.xml         |  2 +-
 .../biz/loantemplate/LoanTemplateService.java       |  7 +++++++
 .../financialPolicy/ProductPolicyVo.java            |  2 ++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java
index e9eef166f7..4c17964741 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java
@@ -23,4 +23,6 @@ public class AppLoanTemplateVo implements Vo {
     private String vehModel;
     @ApiModelProperty("方案1-4，0-3")
     private int plan;
+
+    private String sid;
 }
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 1613b97c8c..ffe0037045 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
@@ -1390,11 +1390,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //月还金额 = 总月还/贷款月还
         loanPayMoneyAll = loanPayMoneyAll.setScale(0, BigDecimal.ROUND_HALF_UP);
         String monthlyRepay = "";
-        if (loanPeriod.equals(otherPolicyPeriod)) {
-            monthlyRepay = loanPayMoneyAll.toString() + "/-";
-        } else {
-            monthlyRepay = loanPayMoneyAll.toString() + "/" + calculateVo.getLoanPayMoney();
+        if (otherPolicyState) {//包含
+            if (loanPeriod.equals(otherPolicyPeriod)) {
+                monthlyRepay = loanPayMoneyAll.toString() + "/-";
+            } else {
+                monthlyRepay = loanPayMoneyAll.toString() + "/" + calculateVo.getLoanPayMoney();
+            }
+        }else{
+            monthlyRepay = loanPayMoneyAll.toString();
         }
+
         //方案汇总月还金额
         calculateVo.setMonthlyRepay(monthlyRepay);
         //利息总额
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml
index be635ea8ff..7d28a6c43e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml
@@ -56,7 +56,7 @@
     </select>
 
     <select id="getCustomizedList" resultType="com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo">
-        select lfp.templateName,lfp.vehPrice,lfp.filingDate,lfp.vehModel,
+        select lfp.templateName,lfp.vehPrice,lfp.filingDate,lfp.vehModel,lfp.sid,
         case lfp.showTypeKey
         when '001' then '0'
         when '002' then '1'
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java
index 3e7b9b92c3..182d5c1680 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java
@@ -1018,6 +1018,8 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
     }
 
     public ResultBean<AppLoanTemplateInfoVo> getCustomizedInfo(String sid) {
+        //前X期月还，X为其他融的期数，前X期月还就是主方案月还+其他融的月还。
+        //剩余期数为主的期数-其他融期数。剩余月还为主方案月还。
         ResultBean<AppLoanTemplateInfoVo> rb = ResultBean.fireFail();
         AppLoanTemplateInfoVo appLoanTemplateInfoVo = new AppLoanTemplateInfoVo();
         LoanTemplate loanTemplate = fetchBySid(sid);
@@ -1030,18 +1032,23 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
             if (StringUtils.isNotBlank(otherpolicy.getPeriod())) {
                 String period = otherpolicy.getPeriod();
                 String[] split = period.split("/");
+                //其他融期数
                 String beforePeriod = split[0];
+                //剩余期数
                 String afterPeriod = split[1];
+                //其他融期数为0，且剩余期数不为0，前X期期数为剩余期数。
                 if (beforePeriod.equals("0") && !afterPeriod.equals("0")) {
                     appLoanTemplateInfoVo.setTimes(afterPeriod);
                     appLoanTemplateInfoVo.setPreviousRepay(otherpolicy.getMonthlyRepay());
                 } else if (!beforePeriod.equals("0") && afterPeriod.equals("0")) {
+                    //前X期期数不为0，且剩余期数为0，则表示主方案期数与其他融期数一致。前X期为其他融期数，前X期月还为主方案月还+其他融月还
                     String monthlyRepay = otherpolicy.getMonthlyRepay();
                     appLoanTemplateInfoVo.setTimes(beforePeriod);
                     String[] splitMonthlyPepay = monthlyRepay.split("/");
                     String beforeMoney = splitMonthlyPepay[0];
                     appLoanTemplateInfoVo.setPreviousRepay(beforeMoney);
                 } else {
+                    //前X期不为0，且剩余期数不为0，则前X期期数为其他融期数，前X期月还为主方案月还+其他融月还。剩余期数为主方案期数-其他融期数，剩余月还为主方案月还。
                     String monthlyRepay = otherpolicy.getMonthlyRepay();
                     appLoanTemplateInfoVo.setTimes(beforePeriod);
                     String[] splitMonthlyPepay = monthlyRepay.split("/");
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java
index d2c0d8ab0e..a27109f8f5 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java
@@ -22,4 +22,6 @@ public class ProductPolicyVo implements Vo {
     private String vehModel;
     @ApiModelProperty("方案1-4，0-3")
     private int plan;
+
+    private String sid;
 }