优化

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")
@@ -222,4 +223,8 @@ public interface CrmCustomerTempFeign {
     @ApiOperation("根据客户sid修改身份证号码")
     @PostMapping("/updateIdBySid")
     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

@@ -1318,4 +1318,24 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
 //        }
         return records;
     }
+
+    public ResultBean<String> updateTemp(CustomerSecondSalesDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        AppCrmCustomerTempDto appCrmCustomerTempDto = new AppCrmCustomerTempDto();
+        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());
+        ResultBean<String> resultBean = saveOrUpdateAppCustomerTemp(appCrmCustomerTempDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
 }

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/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,83 @@
+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.loansecondarysalescustomer.LoanSecondarySalesCustomer;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomerDto;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.SalesInitVo;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
+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;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/30
+ **/
+@Service
+public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSecondarySalesCustomerMapper, LoanSecondarySalesCustomer> {
+
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
+
+    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);
+        }
+        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 ='交回车辆二次销售补充客户信息';
+
+