Merge remote-tracking branch 'origin/master'

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java

@@ -163,4 +163,7 @@ public class AppCrmCustomerTempDto implements Dto {
     @ApiModelProperty("身份证正反面")
     private List<String> filePaths = Collections.emptyList();
 
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
+
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java

@@ -154,4 +154,7 @@ public class CrmCustomerTemp extends BaseEntity {
 
     @ApiModelProperty("见面方式（到店/电话/拜访）")
     private String visitWay;
+
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -98,6 +98,7 @@ public interface CrmCustomerTempFeign {
 
     /**
      * 客户列表导出
+     *
      * @param crmCustomerTempQuery
      */
     @PostMapping("/exportExcel")
@@ -221,5 +222,9 @@ public interface CrmCustomerTempFeign {
 
     @ApiOperation("根据客户sid修改身份证号码")
     @PostMapping("/updateIdBySid")
-    ResultBean updateIdBySid(@RequestParam("idCard") String idCard,@RequestParam("custSid") String custSid);
+    ResultBean updateIdBySid(@RequestParam("idCard") String idCard, @RequestParam("custSid") String custSid);
+
+    @ApiOperation("新增或更新客户信息")
+    @PostMapping("/updateTemp")
+    ResultBean<String> updateTemp(@RequestBody CustomerSecondSalesDto dto);
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -175,5 +175,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> updateTemp(CustomerSecondSalesDto dto) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CustomerSecondSalesDto.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Data
+public class CustomerSecondSalesDto implements Dto {
+    private static final long serialVersionUID = -1955772984622113809L;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    private String customerTypeKey;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("证件类型")
+    private String certificateTypeKey;
+    private String certificateType;
+    @ApiModelProperty("证件号码")
+    @JsonProperty("IDNumber")
+    private String IDNumber;
+    @ApiModelProperty("证件有效期")
+    private String endDate;
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
+
+    private String userSid;
+
+    private String orgPath;
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -352,5 +352,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return rb.success();
     }
 
+    @Override
+    public ResultBean<String> updateTemp(CustomerSecondSalesDto dto) {
+        return crmCustomerTempService.updateTemp(dto);
+    }
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1158,7 +1158,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String dtoSid = dto.getSid();
         //手机号
         String phone = dto.getPhone();
-        if (StringUtils.isNotBlank(phone)){
+        if (StringUtils.isNotBlank(phone)) {
             if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
                 return rb.setMsg("手机号格式不正确");
             }
@@ -1318,4 +1318,39 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
 //        }
         return records;
     }
+
+    public ResultBean<String> updateTemp(CustomerSecondSalesDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        AppCrmCustomerTempDto appCrmCustomerTempDto = new AppCrmCustomerTempDto();
+        if(StringUtils.isNotBlank(dto.getCustomerSid())){
+            CrmCustomerTemp customerTemp = fetchBySid(dto.getCustomerSid());
+            BeanUtils.copyProperties(customerTemp,appCrmCustomerTempDto);
+            appCrmCustomerTempDto.setSid(dto.getCustomerSid());
+            appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey());
+            appCrmCustomerTempDto.setCertificateType(dto.getCertificateType());
+            appCrmCustomerTempDto.setIDNumber(dto.getIDNumber());
+            appCrmCustomerTempDto.setEndDate(dto.getEndDate());
+            appCrmCustomerTempDto.setCertificateAddress(dto.getCertificateAddress());
+            appCrmCustomerTempDto.setUserSid(dto.getUserSid());
+        }else{
+            appCrmCustomerTempDto.setSid(dto.getCustomerSid());
+            appCrmCustomerTempDto.setName(dto.getCustomerName());
+            appCrmCustomerTempDto.setMobile(dto.getMobile());
+            appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey());
+            appCrmCustomerTempDto.setCertificateType(dto.getCertificateType());
+            appCrmCustomerTempDto.setCustomerType(dto.getCustomerType());
+            appCrmCustomerTempDto.setCustomerTypeKey(dto.getCustomerTypeKey());
+            appCrmCustomerTempDto.setIDNumber(dto.getIDNumber());
+            appCrmCustomerTempDto.setEndDate(dto.getEndDate());
+            appCrmCustomerTempDto.setCertificateAddress(dto.getCertificateAddress());
+            appCrmCustomerTempDto.setUserSid(dto.getUserSid());
+            appCrmCustomerTempDto.setOrgPath(dto.getOrgPath());
+        }
+
+        ResultBean<String> resultBean = saveOrUpdateAppCustomerTemp(appCrmCustomerTempDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -70,7 +70,7 @@ public interface FinPaymentrecordFeign {
     @ApiOperation("新增")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@RequestBody FinPaymentrecordDto dto);
+    public ResultBean<String> save(@RequestBody FinPaymentrecordDto dto);
 
     @ApiOperation("新增")
     @PostMapping("/saveReturnSid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -62,8 +62,8 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
     }
 
     @Override
-    public ResultBean save(FinPaymentrecordDto dto) {
+    public ResultBean<String> save(FinPaymentrecordDto dto) {
-        return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");
+        return null;
     }
 
     @Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -73,7 +73,7 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
     }
 
     @Override
-    public ResultBean save(FinPaymentrecordDto dto) {
+    public ResultBean<String> save(FinPaymentrecordDto dto) {
         return finPaymentrecordService.saveDto(dto);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -325,12 +325,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return p;
     }
 
-    public ResultBean saveDto(FinPaymentrecordDto dto) {
+    public ResultBean<String> saveDto(FinPaymentrecordDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinPaymentrecord finPaymentrecord = new FinPaymentrecord();
         BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
         baseMapper.insert(finPaymentrecord);
-        return rb.success();
+        return rb.success().setData(finPaymentrecord.getSid());
     }
 
     public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java

@@ -84,5 +84,6 @@ public class LoanBePadsincereVeh extends BaseEntity {
     private String saleVehSid;
 	@ApiModelProperty("垫款申请sid")
     private String mainSid; // 垫款申请sid
-
+    @ApiModelProperty("出纳付款列表sid")
+    private String paySid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java

@@ -1,10 +1,5 @@
 package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
 
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDto;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyFeignFallback;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyQuery;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescustomer/LoanSecondarySalesCustomer.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Data
+public class LoanSecondarySalesCustomer extends BaseEntity {
+    private static final long serialVersionUID = -4647743383421777867L;
+
+    private String mainSid;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    private String customerTypeKey;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("证件类型")
+    private String certificateTypeKey;
+    private String certificateType;
+    @ApiModelProperty("证件号码")
+    private String IDNumber;
+    @ApiModelProperty("证件有效期")
+    private String endDate;
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescustomer/LoanSecondarySalesCustomerDto.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Data
+public class LoanSecondarySalesCustomerDto implements Dto {
+    private static final long serialVersionUID = 4377892244342062357L;
+
+    private String mainSid;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    private String customerTypeKey;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("证件类型")
+    private String certificateTypeKey;
+    private String certificateType;
+    @ApiModelProperty("证件号码")
+    @JsonProperty("IDNumber")
+    private String IDNumber;
+    @ApiModelProperty("证件有效期")
+    private String endDate;
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescustomer/LoanSecondarySalesCustomerFeign.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyFeignFallback;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSecondarySalesCustomer",
+        name = "anrui-riskcenter",
+        path = "v1/LoanSecondarySalesCustomer",
+        fallback = LoanSecondarySalesCustomerFeignFallback.class)
+public interface LoanSecondarySalesCustomerFeign {
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdate(@RequestBody LoanSecondarySalesCustomerDto dto);
+
+    @ApiOperation("初始化")
+    @GetMapping("/getDetails")
+    ResultBean<SalesInitVo> getDetails(@RequestParam("sid") String sid);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescustomer/LoanSecondarySalesCustomerFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Component
+public class LoanSecondarySalesCustomerFeignFallback {
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescustomer/SalesInitVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Data
+public class SalesInitVo {
+
+    private String mainSid;
+    @ApiModelProperty("销售部门")
+    private String createDept;
+    @ApiModelProperty("销售日期")
+    private String saleDate;
+    @ApiModelProperty("销售价格")
+    private String salePrice;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    private String customerTypeKey;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("证件类型")
+    private String certificateTypeKey;
+    private String certificateType;
+    @ApiModelProperty("证件号码")
+    @JsonProperty("IDNumber")
+    private String IDNumber;
+    @ApiModelProperty("证件有效期")
+    private String endDate;
+    @ApiModelProperty("证件地址")
+    private String certificateAddress;
+    @ApiModelProperty("车辆列表")
+    private List<LoanSecondarySalesVehVo> loanSecondarySalesVehVoList = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -467,7 +467,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             }
             BePadsincereExcelInfo importVo = new BePadsincereExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8){
+            if (physicalNumberOfCells < 8) {
                 physicalNumberOfCells = 8;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
@@ -909,7 +909,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
+                List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos1 = mergeListByBankCon(loanBePadsincereVehDetailsVos);
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos1) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
                     finPaymentrecordDto.setApplySid("");
                     finPaymentrecordDto.setPayCompanySid("");
@@ -934,7 +935,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     finPaymentrecordDto.setPurchaseSystemSid("");
                     finPaymentrecordDto.setPurchaseSystemName("");
                     finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
-                    finPaymentrecordFeign.save(finPaymentrecordDto);
+                    String sid = finPaymentrecordFeign.save(finPaymentrecordDto).getData();
+                    loanBePadsincereVehService.updatePaySid(sid,loanBePadsincereApply.getSid());
                 }
             } else {
                 //极光推送
@@ -958,6 +960,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         }
     }
 
+    private static List<LoanBePadsincereVehDetailsVo> mergeListByBankCon(List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVoList){
+        Map<String, LoanBePadsincereVehDetailsVo> voHashMap = new HashMap<>();
+        for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVoList) {
+            String bankCon = loanBePadsincereVehDetailsVo.getBankContractNo();
+            if (voHashMap.containsKey(bankCon)){
+                LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo1 = voHashMap.get(bankCon);
+                loanBePadsincereVehDetailsVo1.setPadMoney(String.valueOf(Double.parseDouble(loanBePadsincereVehDetailsVo1.getPadMoney()) + Double.parseDouble(loanBePadsincereVehDetailsVo.getPadMoney())));
+            }else {
+                voHashMap.put(bankCon,loanBePadsincereVehDetailsVo);
+            }
+        }
+        return new ArrayList<>(voHashMap.values());
+    }
+
     public ResultBean breakProcess(LoanBePadsincereTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(query.getInstanceId())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java

@@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
-import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVeh;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehVo;
 
@@ -70,4 +67,7 @@ public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVe
 
 	@Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{sid}")
 	List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid);
+
+	@Update("update loan_be_padsincere_veh set paySid = #{paySid} where mainSid = #{mainSid}")
+    void updatePaySid(@Param("paySid") String paySid,@Param("mainSid") String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -102,4 +102,8 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     public List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+    public void updatePaySid(String paySid, String mainSid) {
+        baseMapper.updatePaySid(paySid,mainSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -443,7 +443,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
         List<File> filesList = new ArrayList<>();
         //贷款车辆买卖合同
-        /*List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);*/
+        List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
         //生成车辆融资协议
         List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
         //生成还款协议
@@ -476,12 +476,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //生成公司股东会对外担保决议
             gsgddwdbjyUrls = gsgddwdbjy(printConfirmDto, conSetUpKey);
         }
-        /*if (dkclmmhts != null && dkclmmhts.size() > 0) {
+        if (dkclmmhts != null && dkclmmhts.size() > 0) {
             for (String dkclmmht : dkclmmhts) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht);
                 filesList.add(file);
             }
-        }*/
+        }
         if (clrzxyUrls != null && clrzxyUrls.size() > 0) {
             for (String clrzxyUrl : clrzxyUrls) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + clrzxyUrl);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -74,7 +74,22 @@
         <!--逾期期数-->
         COUNT(a1.sid) AS period,
         <!--逾期金额-->
-        SUM(a1.yq_total) AS overdueMoney,
+        (
+                SUM(a1.yq_total) + IFNULL(
+                    (SELECT SUM(lbpv.`bankBeInter`)
+                     FROM loan_be_padsincere_veh lbpv
+                     WHERE lbpv.saleVehSid = a1.busVinSid),
+                    0
+                ) + IFNULL(
+                        (SELECT SUM(fund)
+                         FROM loan_fund_day
+                         WHERE busSid IN
+                               (SELECT lrpd.sid
+                                FROM loan_repayment_plan_details lrpd
+                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
+                        0
+                    )
+            ) AS    overdueMoney,
         a1.customerSid,
         a1.customer customerName
         FROM (SELECT lrpd.sid,
@@ -90,7 +105,8 @@
                          ) AS yq_total,
                      lrpd.customer,
                      lrpd.customerSid,
-                     lrpd.borrowerSid
+                     lrpd.borrowerSid,
+                     lrpd.busVinSid
               FROM `loan_repayment_plan_details` lrpd
                        LEFT JOIN `loan_repayment_history` lrh
                                  ON lrh.planDetailSid = lrpd.`sid`

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -64,7 +64,22 @@
         SELECT a1.busVinSid       AS busViNSid,
                RIGHT(a1.vinNo, 8) AS vinNo,
         <!--逾期金额-->
-        SUM(a1.yq_total) AS overdueMoney,
+        (
+                SUM(a1.yq_total) + IFNULL(
+                    (SELECT SUM(lbpv.`bankBeInter`)
+                     FROM loan_be_padsincere_veh lbpv
+                     WHERE lbpv.saleVehSid = a1.busVinSid),
+                    0
+                ) + IFNULL(
+                        (SELECT SUM(fund)
+                         FROM loan_fund_day
+                         WHERE busSid IN
+                               (SELECT lrpd.sid
+                                FROM loan_repayment_plan_details lrpd
+                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
+                        0
+                    )
+            )          AS overdueMoney,
         a1.customer    AS customerName,
         a1.customerSid as customerSid,
         a1.borrowerSid    loanSid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml

@@ -27,7 +27,7 @@
                la.procInstId
         from loan_secondary_sales_apply la
                  left join loan_secondary_sales_cost lc on lc.mainSid = la.sid
-        left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv) ss on ss.mainSid = la.sid
+        left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv group by lv.mainSid) ss on ss.mainSid = la.sid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java

@@ -2,7 +2,6 @@ package com.yxt.anrui.riskcenter.biz.loansecondarysalesapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java

@@ -7,9 +7,11 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCos
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,7 +53,9 @@ public class LoanSecondarySalesCostService extends MybatisBaseService<LoanSecond
         } else {
             loanSecondarySalesCost1.setFiles("");
         }
-
+        if (StringUtils.isBlank(loanSecondarySalesCost.getVehPrice())) {
+            loanSecondarySalesCost1.setVehPrice(BigDecimal.ZERO);
+        }
         baseMapper.insert(loanSecondarySalesCost1);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerMapper.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalescustomer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Mapper
+public interface LoanSecondarySalesCustomerMapper extends BaseMapper<LoanSecondarySalesCustomer> {
+    LoanSecondarySalesCustomer selectByMainSid(String mainSid);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loansecondarysalescustomer.LoanSecondarySalesCustomerMapper">
+    <select id="selectByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomer">
+        select *
+        from loan_secondary_sales_customer
+        where mainSid = #{mainSid}
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerRest.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalescustomer;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomerDto;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomerFeign;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.SalesInitVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@RestController
+@RequestMapping("v1/LoanSecondarySalesCustomer")
+@Api(tags = "二次销售补充客户信息")
+public class LoanSecondarySalesCustomerRest implements LoanSecondarySalesCustomerFeign {
+
+    @Autowired
+    private LoanSecondarySalesCustomerService loanSecondarySalesCustomerService;
+
+    @Override
+    public ResultBean saveOrUpdate(LoanSecondarySalesCustomerDto dto) {
+        return loanSecondarySalesCustomerService.saveSalesCustomer(dto);
+    }
+
+    @Override
+    public ResultBean<SalesInitVo> getDetails(String sid) {
+        return loanSecondarySalesCustomerService.getDetails(sid);
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java

@@ -0,0 +1,109 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalescustomer;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CustomerSecondSalesDto;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomer;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomerDto;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.SalesInitVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostMapper;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesveh.LoanSecondarySalesVehService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Service
+public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSecondarySalesCustomerMapper, LoanSecondarySalesCustomer> {
+
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
+    @Autowired
+    private LoanSecondarySalesVehService loanSecondarySalesVehService;
+    @Autowired
+    private LoanSecondarySalesCostMapper loanSecondarySalesCostMapper;
+
+    public ResultBean saveSalesCustomer(LoanSecondarySalesCustomerDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanSecondarySalesCustomer loanSecondarySalesCustomer = baseMapper.selectByMainSid(dto.getMainSid());
+        String customerSid = dto.getCustomerSid();
+        LoanSecondarySalesApply loanSecondarySalesApply = loanSecondarySalesApplyService.fetchBySid(dto.getMainSid());
+        String userSid = loanSecondarySalesApply.getCreateBySid();
+        String orgPath = loanSecondarySalesApply.getOrgSidPath();
+        if (loanSecondarySalesCustomer == null) {
+            //新增客户
+            CustomerSecondSalesDto customerSecondSalesDto = new CustomerSecondSalesDto();
+            BeanUtil.copyProperties(dto, customerSecondSalesDto);
+            customerSecondSalesDto.setUserSid(userSid);
+            customerSecondSalesDto.setOrgPath(orgPath);
+            ResultBean<String> resultBean = crmCustomerTempFeign.updateTemp(customerSecondSalesDto);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            customerSid = resultBean.getData();
+            loanSecondarySalesCustomer = new LoanSecondarySalesCustomer();
+            BeanUtil.copyProperties(dto, loanSecondarySalesCustomer);
+            loanSecondarySalesCustomer.setCustomerSid(customerSid);
+            baseMapper.insert(loanSecondarySalesCustomer);
+        } else {
+            //新增客户
+            CustomerSecondSalesDto customerSecondSalesDto = new CustomerSecondSalesDto();
+            BeanUtil.copyProperties(dto, customerSecondSalesDto);
+            customerSecondSalesDto.setUserSid(userSid);
+            customerSecondSalesDto.setOrgPath(orgPath);
+            ResultBean<String> resultBean = crmCustomerTempFeign.updateTemp(customerSecondSalesDto);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            customerSid = resultBean.getData();
+            BeanUtil.copyProperties(dto, loanSecondarySalesCustomer);
+            loanSecondarySalesCustomer.setCustomerSid(customerSid);
+            baseMapper.updateById(loanSecondarySalesCustomer);
+        }
+        return rb.success();
+    }
+
+    public ResultBean<SalesInitVo> getDetails(String sid) {
+        ResultBean<SalesInitVo> rb = ResultBean.fireFail();
+        SalesInitVo salesInitVo = new SalesInitVo();
+        LoanSecondarySalesCustomer loanSecondarySalesCustomer = baseMapper.selectByMainSid(sid);
+        if (loanSecondarySalesCustomer != null) {
+            BeanUtil.copyProperties(loanSecondarySalesCustomer, salesInitVo);
+        } else {
+            salesInitVo.setMainSid(sid);
+        }
+        List<LoanSecondarySalesVehVo> loanSecondarySalesVehVoList = loanSecondarySalesVehService.selectByMainSid(sid);
+        loanSecondarySalesVehVoList.removeAll(Collections.singleton(null));
+        if (!loanSecondarySalesVehVoList.isEmpty()) {
+            salesInitVo.setLoanSecondarySalesVehVoList(loanSecondarySalesVehVoList);
+        }
+        LoanSecondarySalesApply loanSecondarySalesApply = loanSecondarySalesApplyService.fetchBySid(sid);
+        if (!"已办结".equals(loanSecondarySalesApply.getNodeState())) {
+            return rb.setMsg("该申请未办结");
+        }
+        salesInitVo.setMainSid(sid);
+        salesInitVo.setCreateDept(loanSecondarySalesApply.getCreateDept());
+        salesInitVo.setSaleDate(loanSecondarySalesApply.getCloseDate());
+        LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(sid);
+        salesInitVo.setSalePrice(loanSecondarySalesCost.getVehPrice().toString());
+        return rb.success().setData(salesInitVo);
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java

@@ -91,9 +91,6 @@ public class SecondarySalesAppVos {
     private String taskId;
     @ApiModelProperty(value = "流程实例id")
     private String procInstId;
-
-    private String files;
-
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
 

doc/databases/risk_center.sql

@@ -1666,6 +1666,37 @@ CREATE TABLE `loan_secondary_sales_cost`
   DEFAULT CHARSET = utf8 COMMENT ='交回车辆二次销售申请费用说明';
 
 
+DROP TABLE IF EXISTS `loan_secondary_sales_customer`;
+CREATE TABLE `loan_secondary_sales_customer`
+(
+    `id`                 int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`        int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`              int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`            varchar(64)          DEFAULT NULL COMMENT '主表sid',
+    `customerSid`        varchar(64)          DEFAULT NULL COMMENT '客户sid',
+    `customerName`       varchar(500)         DEFAULT NULL COMMENT '新车主名称',
+    `customerType`       varchar(64)          DEFAULT NULL COMMENT '客户类型',
+    `customerTypeKey`    varchar(64)          DEFAULT NULL COMMENT '客户类型',
+    `mobile`             varchar(64)          DEFAULT NULL COMMENT '联系电话',
+    `certificateTypeKey` varchar(64)          DEFAULT NULL COMMENT '证件类型',
+    `certificateType`    varchar(64)          DEFAULT NULL COMMENT '证件类型',
+    `IDNumber`           varchar(64)          DEFAULT NULL COMMENT '证件号码',
+    `endDate`            varchar(64)          DEFAULT NULL COMMENT '证件有效期',
+    `certificateAddress` text                 DEFAULT NULL COMMENT '证件地址',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交回车辆二次销售补充客户信息';
+
+