From 4fe2bd4d95130a2e9ef723c7b42fe2bb28278099 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 28 May 2024 10:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B7=E5=90=8E=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleOutApplyFeign.java             | 10 ++-
 .../BaseVehicleOutApplyFeignFallback.java     |  7 ++-
 .../BaseVehicleOutApplyMapper.java            | 10 +--
 .../BaseVehicleOutApplyMapper.xml             | 11 +++-
 .../BaseVehicleOutApplyRest.java              |  5 ++
 .../BaseVehicleOutApplyService.java           | 11 +++-
 .../LoanRepaymentScheduleService.java         | 62 +++++++++++++++++--
 7 files changed, 102 insertions(+), 14 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
index c71271e53f..0b75d37526 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
@@ -65,14 +65,18 @@ public interface BaseVehicleOutApplyFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-}
\ No newline at end of file
+
+    @ApiOperation("查询根据车架号查询销售订单信息")
+    @PostMapping("/selectSidByVinNo")
+    ResultBean<String> selectSidByVinNo(@RequestParam("vinNo") String vinNo);
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
index 5f7f4770a8..f041cd78f6 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
@@ -69,4 +69,9 @@ public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehicleoutapply/fetchDetailsBySid无法访问");
 	}
-}
\ No newline at end of file
+
+	@Override
+	public ResultBean<String> selectSidByVinNo(String vinNo) {
+		return null;
+	}
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
index 307bea6158..5f90f6fa6b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
@@ -57,13 +57,15 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
 
 	//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
 	//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
-	
+
 	IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
-	
+
 	List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
-	
+
 	@Select("select * from base_vehicle_out_apply")
 	List<BaseVehicleOutApplyVo> selectListVo();
 
 	int selectPageVoCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
-}
\ No newline at end of file
+
+    String selectSidByVinNo(@Param("vinNo") String vinNo);
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
index 4e997d0b97..99468ca28c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
@@ -77,4 +77,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
-</mapper>
\ No newline at end of file
+    <select id="selectSidByVinNo" resultType="java.lang.String">
+        SELECT
+            s.sid
+        FROM
+            base_vehicle_out AS o
+                LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
+                LEFT JOIN anrui_buscenter.bus_sales_order as s ON a.contractNo = s.contractNo
+        WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
+    </select>
+</mapper>
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
index d4b90f3271..afc6305879 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
@@ -92,4 +92,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
 		BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<String> selectSidByVinNo(String vinNo) {
+		return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
+	}
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
index 1fc30454c9..a75d03a42f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
@@ -55,6 +55,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -295,4 +296,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
-}
\ No newline at end of file
+
+    public ResultBean<String> selectSidByVinNo(String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = "";
+        String substringVinNo = vinNo.substring(vinNo.length() - 8);
+        sid = baseMapper.selectSidByVinNo(substringVinNo);
+        return rb.success().setData(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 8b14c99ce5..c82917f543 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
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
@@ -122,7 +123,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     private LoanFinOtherPolicyService loanFinOtherPolicyService;
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
-
+    @Autowired
+    private BaseVehicleOutApplyFeign baseVehicleOutApplyFeign;
     /**
      * 根据销售订单SID生成还款计划表回显
      *
@@ -4661,6 +4663,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<FinUncollectedReceivablesDetailedJR> jrList = new ArrayList<>();//金融应收
         List<LoanFundDay> loanFundDays = new ArrayList<>();//资金占用费生成记录
         for (HistoryDataImportVo v : list) {
+            String isOther = "0";//是否有其他融 1是0否
+            String sameBank = "0";//是否资方一致 1是0否
             String customerNo = ""; //客户编码
             String customerSid = "";
             String customerName = "";
@@ -4671,6 +4675,31 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String orgPath = "";
             String borrowerCustomerSid = "";
             String borrowerCustomerName = "";
+            String mPeriod = v.getMainPeriod();
+            String mDay = v.getMainRepayDate();
+            String mF = v.getMainFirstRepay();
+            String mM = v.getMainMidRepay();
+            String mL = v.getMainLastRepay();
+            String oF = "";
+            String oM = "";
+            String oL = "";
+            String oPeriod = "";
+            String oDay = "";
+            String salesOrderSid = "";
+            String loanContractSid = "";
+            String borrowerSid = "";
+            String[] splitVin = v.getVinNo().split(",");
+            if (StringUtils.isNotBlank(v.getOtherBankNo())) {
+                isOther = "1";
+                if (v.getBankContractNo().equals(v.getOtherBankNo())) {
+                    sameBank = "1";
+                }
+                oF = v.getOtherFirstRepay();
+                oM = v.getOtherMidRepay();
+                oL = v.getOtherLastRepay();
+                oPeriod = v.getOtherPeriod();
+                oDay = v.getOtherRepayDate();
+            }
             SysOrganization orgDept = sysOrganizationFeign.selectByOrgCode(v.getSalesDeptNo()).getData();
             if (orgDept != null) {
                 deptSid = orgDept.getSid();
@@ -4683,7 +4712,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 useOrgName = orgCompany.getName();
             }
             String prefix = getPrefix(orgDept, orgCompany, v.getActualName(), v.getActualPhone());
-          //客户表新增实际购车人
+            //客户表新增实际购车人
             if (StringUtils.isNotBlank(prefix)) {
                 CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(prefix).getData();
                 if (null != customerTemp) {
@@ -4691,9 +4720,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     customerName = customerTemp.getName();
                 } else {
                     CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
+                    String phone = v.getActualPhone() + "-D";
+                    String prefixNo = getPrefix(orgDept, orgCompany, v.getActualName(), phone);
                     customerSid = crmCustomerTemp.getSid();
                     customerName = v.getActualName();
-                    crmCustomerTemp.setCustomerNo(prefix);
+                    crmCustomerTemp.setCustomerNo(prefixNo);
+                    crmCustomerTemp.setName(v.getActualName());
                     crmCustomerTemp.setMobile(v.getActualPhone());
                     crmCustomerTemp.setCustomerType("个人");
                     crmCustomerTemp.setCustomerTypeKey("1");
@@ -4703,7 +4735,29 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 }
             }
             //客户表新增贷款人
-            crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo());
+            CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo()).getData();
+            if (null != customerTemp) {
+                borrowerCustomerSid = customerTemp.getSid();
+                borrowerCustomerName = customerTemp.getName();
+            } else {
+                CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
+                borrowerCustomerSid = crmCustomerTemp.getSid();
+                borrowerCustomerName = v.getBorrowerName();
+                crmCustomerTemp.setCustomerNo(v.getBorrowerNo());
+                crmCustomerTemp.setName(v.getBorrowerName());
+                crmCustomerTemp.setCustomerType("个人");
+                crmCustomerTemp.setCustomerTypeKey("1");
+                crmCustomerTemp.setCreateOrgSid(useOrgSid);
+                crmCustomerTemp.setIsEnable(3);
+                customerTemps.add(crmCustomerTemp);
+            }
+            //根据车架号查询销售订单
+            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(splitVin[0]).getData();
+            if (StringUtils.isNotBlank(orderSid)) {
+
+            }
+
+
         }