贷后生成历史数据

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);
-}
+
+    @ApiOperation("根据订单sid车架号查询")
+    @GetMapping("/selByOrderSidAndVinNo")
+    ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo);
+}

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;
     }
 
-}
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        return null;
+    }
+
+}

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);
-}
+
+    BusSalesOrderVehicle selByOrderSidAndVinNo(@Param("salesOrderSid") String salesOrderSid, @Param("vinNo") String vinNo);
+}

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>
+    <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>

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);
     }
-}
+
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selByOrderSidAndVinNo(salesOrderSid,vinNo);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
+}

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);
     }
-}
+
+    public BusSalesOrderVehicle selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        String substringVinNo = vinNo.substring(vinNo.length() - 8);
+        return baseMapper.selByOrderSidAndVinNo(salesOrderSid,substringVinNo);
+    }
+}

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接口--------------------
 

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;
     }
 

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

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";// 临时目录