Merge remote-tracking branch 'origin/master'

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,

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);
                             }
                         }
                         // 其他融产品