From b4b7e3c4ab57a1e19cb50757782a400a2a1eece1 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 14 May 2024 09:11:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=A1=A8=E8=BD=A6=E6=9E=B6=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=90=8E?=
 =?UTF-8?q?=E5=85=AB=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderLoancontractService.java     | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
index 63f89ab7d9..1c2913c10b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
@@ -389,7 +389,14 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                     List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
                     busSalesOrderVehicles.removeAll(Collections.singleton(null));
                     if (!busSalesOrderVehicles.isEmpty()) {
-                        List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
+                        List<String> stringVinNos = new ArrayList<>();
+                        for (BusSalesOrderVehicle v : busSalesOrderVehicles) {
+                            if (v.getLinkNo().length() > 8) {
+                                stringVinNos.add(v.getLinkNo().substring(v.getLinkNo().length() - 8));
+                            } else {
+                                stringVinNos.add(v.getLinkNo());
+                            }
+                        }
                         if (!stringVinNos.isEmpty()) {
                             record.setVinNo(String.join(",", stringVinNos));
                         }
@@ -406,7 +413,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         //车辆数
                         BigDecimal vehCount = new BigDecimal(schedule.getVehCount());
                         if (StringUtils.isNotBlank(schedule.getIsDifferent())) {
-                            if (schedule.getIsDifferent().equals("是")) {
+                            if (schedule.getIsDifferent().equals("1")) {
                                 //判断是否有一台车不同月还金额
                                 //主产品期数
                                 BigDecimal mainPeriod = new BigDecimal(schedule.getMainPeriod());
@@ -437,6 +444,36 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                     record.setMainAmount(mainAmount.toString());
                                     record.setAmountAll(mainAmount.toString());
                                 }
+                            } else if (schedule.getIsDifferent().equals("0")) {
+                                //主产品期数
+                                BigDecimal mainPeriod = new BigDecimal(schedule.getMainPeriod());
+                                //主产品首期月还
+                                BigDecimal mainFirstRepay = schedule.getMainFirstRepay().multiply(vehCount);
+                                //主产品期间月还
+                                BigDecimal mainMidRepay = mainPeriod.subtract(new BigDecimal("2")).multiply(schedule.getMainMidRepay()).multiply(vehCount);
+                                //主产品末期月还
+                                BigDecimal mainLastRepay = schedule.getMainLastRepay().multiply(vehCount);
+                                mainAmount = mainFirstRepay.add(mainMidRepay).add(mainLastRepay);
+                                if (schedule.getIsOtherPolicy().equals("1")) {
+                                    //有其他融
+                                    //其他融期数
+                                    BigDecimal otherPeriod = new BigDecimal(schedule.getOtherPeriod());
+                                    //其他融首期月还
+                                    BigDecimal otherFirstRepay = schedule.getOtherFirstRepay().multiply(vehCount);
+                                    //其他融期间月还
+                                    BigDecimal otherMidRepay = otherPeriod.subtract(new BigDecimal("2")).multiply(schedule.getOtherMidRepay()).multiply(vehCount);
+                                    //其他融末期月还
+                                    BigDecimal otherLastRepay = schedule.getOtherLastRepay().multiply(vehCount);
+                                    otherAmount = otherFirstRepay.add(otherMidRepay).add(otherLastRepay);
+                                    amountAll = mainAmount.add(otherAmount);
+                                    record.setMainAmount(mainAmount.toString());
+                                    record.setOtherAmount(otherAmount.toString());
+                                    record.setAmountAll(amountAll.toString());
+                                } else if (schedule.getIsOtherPolicy().equals("0")) {
+                                    //没有其他融
+                                    record.setMainAmount(mainAmount.toString());
+                                    record.setAmountAll(mainAmount.toString());
+                                }
                             }
                         } else {
                             //主产品期数

From 754fe7276af2db208ed36969366ddc72a146ac4b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 14 May 2024 10:05:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=97=A5=E6=9C=9F=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loanrepaymentschedule/LoanRepaymentScheduleMapper.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
index 7bc0b8f38a..ed77bdc3c6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
@@ -106,7 +106,7 @@
         SELECT
         @row_number := @row_number + 1 AS rankNo,
         p.loanContractSid,
-        p.createTime,
+        l.repaymentCreateTime as createTime,
         p.customer,
         p.staffName,
         p.borrowerName,
@@ -129,7 +129,9 @@
         p.dept,
         p.useOrgName
         FROM
-        loan_repayment_plan_details AS p,(
+        loan_repayment_plan_details AS p
+        LEFT JOIN anrui_buscenter.bus_sales_order_loancontract as l ON p.loanContractSid = l.sid
+        ,(
         SELECT
         @row_number := 0
         ) AS t