From eab471301f95ea570fc577636359c7fc6404c590 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 1 Jul 2024 17:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E5=90=8E=E7=94=9F=E6=88=90=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderVehicleFeign.java            |  6 ++++-
 .../BusSalesOrderVehicleFeignFallback.java    |  7 +++++-
 .../BusSalesOrderVehicleMapper.java           |  4 +++-
 .../BusSalesOrderVehicleMapper.xml            | 10 +++++++-
 .../BusSalesOrderVehicleRest.java             |  9 +++++++-
 .../BusSalesOrderVehicleService.java          |  7 +++++-
 .../LoanRepaymentScheduleFeign.java           |  2 +-
 .../LoanRepaymentScheduleFeignFallback.java   |  2 +-
 .../LoanRepaymentScheduleRest.java            |  4 ++--
 .../LoanRepaymentScheduleService.java         | 23 +++++++++++++++----
 10 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
index 8ca928ecaa..b505685860 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
@@ -171,4 +171,8 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据车辆sid查询最新一条不为终止的销售订单")
     @PostMapping("/selectOneByVehSidAndNotStop")
     ResultBean<String> selectOneByVehSidAndNotStop(@RequestParam("vehSid") String vehSid);
-}
\ No newline at end of file
+
+    @ApiOperation("根据订单sid车架号查询")
+    @GetMapping("/selByOrderSidAndVinNo")
+    ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo);
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
index a20623cc19..a8c4269d99 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
@@ -168,4 +168,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
-}
\ No newline at end of file
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        return null;
+    }
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
index 2e054ed7ca..2df56b44e0 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
@@ -183,4 +183,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<String> selectBySalesOrderSid2(String saleOrderSid);
 
     String selectOneByVehSidAndNotStop(String vehSid);
-}
\ No newline at end of file
+
+    BusSalesOrderVehicle selByOrderSidAndVinNo(@Param("salesOrderSid") String salesOrderSid, @Param("vinNo") String vinNo);
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
index 8c25131095..feb5930bd1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@@ -364,4 +364,12 @@
         ORDER BY bv.`createTime` DESC
                 LIMIT 1
     </select>
-</mapper>
\ No newline at end of file
+    <select id="selByOrderSidAndVinNo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        SELECT
+            *
+        FROM bus_sales_order_vehicle bv
+        where bv.`salesOrderSid` = #{salesOrderSid} and
+            bv.linkNo LIKE CONCAT( '%', #{vinNo}, '%' )
+    </select>
+</mapper>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
index e3ed02d2c2..650841a793 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
@@ -192,4 +192,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         String orderSid = busSalesOrderVehicleService.selectOneByVehSidAndNotStop(vehSid);
         return rb.success().setData(orderSid);
     }
-}
\ No newline at end of file
+
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selByOrderSidAndVinNo(salesOrderSid,vinNo);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
index 8ed42d3367..8ae0f9d4ac 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
@@ -667,4 +667,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public String selectOneByVehSidAndNotStop(String vehSid) {
         return baseMapper.selectOneByVehSidAndNotStop(vehSid);
     }
-}
\ No newline at end of file
+
+    public BusSalesOrderVehicle selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        String substringVinNo = vinNo.substring(vinNo.length() - 8);
+        return baseMapper.selByOrderSidAndVinNo(salesOrderSid,substringVinNo);
+    }
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
index 12db583f7f..460966e41b 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
@@ -87,7 +87,7 @@ public interface LoanRepaymentScheduleFeign {
     @ApiOperation(value = "导入贷后历史数据")
     @PostMapping("/importHistoryData")
     public ResultBean importHistoryData(
-            @RequestParam(value = "file") MultipartFile file, @RequestParam(value = "request") HttpServletRequest request, @RequestParam(value = "response") HttpServletResponse response) throws IOException;
+            @RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException;
 
     //-------------------------app接口--------------------
 
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
index c73fe84cd6..211c66c183 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
@@ -74,7 +74,7 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
     }
 
     @Override
-    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException {
         return null;
     }
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
index 855cc4ee9c..6aa45f3c2f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
@@ -89,8 +89,8 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
     }
 
     @Override
-    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        return loanRepaymentScheduleService.importHistoryData(file,request,response);
+    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException {
+        return loanRepaymentScheduleService.importHistoryData(file,request);
     }
 
     @Override
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 2da59b339d..e48176a07f 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
@@ -4891,7 +4891,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     /**
      * 导入历史数据生成还款计划表
      */
-    public void saveHistoryRecord(List<HistoryDataImportVo> list) {
+    public List<LoanRepaymentPlanDetails> saveHistoryRecord(List<HistoryDataImportVo> list) {
         List<LoanRepaymentSchedule> schedules = new ArrayList<>(); //还款计划表主表
         List<LoanRepaymentPlanDetails> planDetails = new ArrayList<>();//还款计划表明细
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
@@ -4928,7 +4928,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String salesOrderSid = "";
             String loanContractSid = "";
             String borrowerSid = "";
-            String[] splitVin = v.getVinNo().split(",");
+            String vinNo = v.getVinNo();
+            String busVinSid = "";
             if (StringUtils.isNotBlank(v.getOtherBankNo())) {
                 isOther = "1";
                 if (v.getBankContractNo().equals(v.getOtherBankNo())) {
@@ -4992,18 +4993,30 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 customerTemps.add(crmCustomerTemp);
             }
             //根据车架号查询销售订单
-            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(splitVin[0]).getData();
+            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
             if (StringUtils.isNotBlank(orderSid)) {
+                salesOrderSid = orderSid;
+                // 查询销售订单车辆列表
+                ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid,vinNo);
+                BusSalesOrderVehicle vehicleData = busSalesOrderVehicle.getData();
+                if (vehicleData != null) {
+                    busVinSid = vehicleData.getSid();
+                    loanContractSid = vehicleData.getLoanContractSid();
+                    borrowerSid = vehicleData.getBorrowerSid();
+                }
+            } else {
+
+
 
             }
 
 
         }
 
-
+        return planDetails;
     }
 
-    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) {
         ResultBean rb = ResultBean.fireFail();
         try {
             String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录