From 6ff5812b9f1157e3e6eec147f3863b53b9c1e887 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 23 Jan 2024 12:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=9E=8D=E8=B5=84=E6=96=B9=E5=90=88=E5=90=8C=E5=8F=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentPlanDetailsMapper.xml        | 20 +++++++++++--------
 .../LoanRepaymentScheduleService.java         |  5 +++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 401656f3b5..c4c038497c 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -148,12 +148,13 @@
                                  pd.overdue,
                                  t.repaidMoney,
                                  t.outstandingMoney,
-                                 IFNULL(v.bankBeInter, 0) AS bankBeInter,
+--                                  IFNULL(v.bankBeInter, 0) AS bankBeInter,
+                                 IFNULL(pd.paymentInterest, 0) AS bankBeInter,
                                  pd.overdue               AS dueOverdue,
                                  pd.updateTime            AS updateDate
                           FROM loan_repayment_plan_details AS pd
                                    LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
-                                   LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
+--                                    LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
                                    LEFT JOIN (
                               SELECT p.sid,
                                      IFNULL((
@@ -289,13 +290,14 @@
         pd.salesOrderSid,
         t.repaidMoney,
         t.outstandingMoney,
-        IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+--         IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+        IFNULL( pd.paymentInterest, 0 ) AS bankBeInter,
         pd.overdue AS dueOverdue,
         pd.updateTime AS updateDate
         FROM
         loan_repayment_plan_details AS pd
         LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
-        LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
+--         LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
         LEFT JOIN (
         SELECT
         p.sid,
@@ -384,13 +386,14 @@
         pd.salesOrderSid,
         t.repaidMoney,
         t.outstandingMoney,
-        IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+--         IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+        IFNULL( pd.paymentInterest, 0 ) AS bankBeInter,
         pd.overdue AS dueOverdue,
         pd.updateTime AS updateDate
         FROM
         loan_repayment_plan_details AS pd
         LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
-        LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
+--         LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
         LEFT JOIN (
         SELECT
         p.sid,
@@ -490,13 +493,14 @@
         pd.salesOrderSid,
         t.repaidMoney,
         t.outstandingMoney,
-        IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+--         IFNULL( v.bankBeInter, 0 ) AS bankBeInter,
+        IFNULL( pd.paymentInterest, 0 ) AS bankBeInter,
         pd.overdue AS dueOverdue,
         pd.updateTime AS updateDate
         FROM
         loan_repayment_plan_details AS pd
         LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
-        LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
+--         LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
         LEFT JOIN (
         SELECT
         p.sid,
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
index 8da2453f8a..588a538de1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
@@ -149,6 +149,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderSid).getData();
         String orderSid = "";
         String bankNo = "";
+        String otherBankNo = "";
         if (null != loancontract) {
             // 消贷合同编号
             if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
@@ -214,6 +215,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (null != schedule.getMainLastRepay()) {
                         vo.setMainLastRepay(schedule.getMainLastRepay().toString());
                     }
+                    if (StringUtils.isNotBlank(schedule.getOtherBankNo())) {
+                        otherBankNo = schedule.getOtherBankNo();
+                    }
                 }
                 //查看是否有其他融
                 LoanSolutionsOtherpolicy otherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
@@ -245,6 +249,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 vo.setOtherBankNo(bankNo);
                             } else {
                                 vo.setSameBank("0");
+                                vo.setOtherBankNo(otherBankNo);
                             }
                         }
                         // 其他融产品