Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

@@ -229,4 +229,18 @@ public class RedisConstant {
 
     public static final String PHONE_NUMBER= "phone_number_";
 
+    /**
+     * MDM 省市区数据缓存
+     */
+
+    /**
+     * 省级数据缓存
+     */
+    public static final String MDM_AREA_PROVINCE = "mdm:area:province";
+
+    /**
+     * 其他区域数据缓存
+     */
+    public static final String MDM_AREA_OTHERS = "mdm:area:others";
+
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/MdmAreaMapper.java

@@ -0,0 +1,20 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.MDMAreaDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface MdmAreaMapper {
+
+    /**
+     * 获取 MDM 省级地区数据
+     * @return
+     */
+    List<MDMAreaDO> getProvince();
+
+    List<MDMAreaDO> getSonArea(@Param("code") String code);
+
+}

coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml

@@ -6,20 +6,6 @@
     <result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
     <result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
     <result column="partner_interview_id" jdbcType="BIGINT" property="partnerInterviewId" />
-    <result column="partnership" jdbcType="VARCHAR" property="partnership" />
-    <result column="want_sign_time" jdbcType="TIMESTAMP" property="wantSignTime" />
-    <result column="partner_fee" jdbcType="VARCHAR" property="partnerFee" />
-    <result column="security_fund" jdbcType="VARCHAR" property="securityFund" />
-    <result column="technical_service_fee" jdbcType="VARCHAR" property="technicalServiceFee" />
-    <result column="intention_money" jdbcType="VARCHAR" property="intentionMoney" />
-    <result column="intention_signer_username" jdbcType="VARCHAR" property="intentionSignerUsername" />
-    <result column="intention_signer_mobile" jdbcType="VARCHAR" property="intentionSignerMobile" />
-    <result column="intention_edu" jdbcType="VARCHAR" property="intentionEdu" />
-    <result column="real_control_username" jdbcType="VARCHAR" property="realControlUsername" />
-    <result column="real_control_idcard" jdbcType="VARCHAR" property="realControlIdcard" />
-    <result column="signer_real_control_relation" jdbcType="VARCHAR" property="signerRealControlRelation" />
-    <result column="signer_other_real_control_relation" jdbcType="VARCHAR" property="signerOtherRealControlRelation" />
-    <result column="signer_real_control_relation_cert" jdbcType="VARCHAR" property="signerRealControlRelationCert" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -42,53 +28,17 @@
       <if test="record.partnerInterviewId != null">
         partner_interview_id,
       </if>
-      <if test="record.partnership != null">
-        partnership,
-      </if>
       <if test="record.qualifyVerifyId != null">
         qualify_verify_id,
       </if>
       <if test="record.intentionContractNo != null">
         intention_contract_no,
       </if>
-      <if test="record.wantSignTime != null">
+      <if test="record.dataSource != null">
-        want_sign_time,
+        data_source,
       </if>
-      <if test="record.partnerFee != null">
+      <if test="record.certificationInfoRecordJson != null">
-        partner_fee,
+        certification_info_record_json,
-      </if>
-      <if test="record.securityFund != null">
-        security_fund,
-      </if>
-      <if test="record.technicalServiceFee != null">
-        technical_service_fee,
-      </if>
-      <if test="record.intentionMoney != null">
-        intention_money,
-      </if>
-      <if test="record.intentionSignerUsername != null">
-        intention_signer_username,
-      </if>
-      <if test="record.intentionSignerMobile != null">
-        intention_signer_mobile,
-      </if>
-      <if test="record.intentionEdu != null">
-        intention_edu,
-      </if>
-      <if test="record.realControlUsername != null">
-        real_control_username,
-      </if>
-      <if test="record.realControlIdcard != null">
-        real_control_idcard,
-      </if>
-      <if test="record.signerRealControlRelation != null">
-        signer_real_control_relation,
-      </if>
-      <if test="record.signerOtherRealControlRelation != null">
-        signer_other_real_control_relation,
-      </if>
-      <if test="record.signerRealControlRelationCert != null">
-        signer_real_control_relation_cert,
       </if>
       <if test="record.createTime != null">
         create_time,
@@ -107,56 +57,17 @@
       <if test="record.partnerInterviewId != null">
         #{record.partnerInterviewId},
       </if>
-      <if test="record.partnership != null">
-        #{record.partnership},
-      </if>
       <if test="record.qualifyVerifyId != null">
         #{record.qualifyVerifyId},
       </if>
       <if test="record.intentionContractNo != null">
         #{record.intentionContractNo},
       </if>
-      <if test="record.wantSignTime != null">
-        #{record.wantSignTime},
-      </if>
       <if test="record.dataSource != null">
         #{record.dataSource},
       </if>
-      <if test="record.partnerFee != null">
+      <if test="record.certificationInfoRecordJson != null">
-        #{record.partnerFee},
+        #{record.certificationInfoRecordJson},
-      </if>
-      <if test="record.securityFund != null">
-        #{record.securityFund},
-      </if>
-      <if test="record.technicalServiceFee != null">
-        #{record.technicalServiceFee},
-      </if>
-      <if test="record.intentionMoney != null">
-        #{record.intentionMoney},
-      </if>
-      <if test="record.intentionSignerUsername != null">
-        #{record.intentionSignerUsername},
-      </if>
-      <if test="record.intentionSignerMobile != null">
-        #{record.intentionSignerMobile},
-      </if>
-      <if test="record.intentionEdu != null">
-        #{record.intentionEdu},
-      </if>
-      <if test="record.realControlUsername != null">
-        #{record.realControlUsername},
-      </if>
-      <if test="record.realControlIdcard != null">
-        #{record.realControlIdcard},
-      </if>
-      <if test="record.signerRealControlRelation != null">
-        #{record.signerRealControlRelation},
-      </if>
-      <if test="record.signerOtherRealControlRelation != null">
-        #{record.signerOtherRealControlRelation},
-      </if>
-      <if test="record.signerRealControlRelationCert != null">
-        #{record.signerRealControlRelationCert},
       </if>
       <if test="record.createTime != null">
         #{record.createTime},
@@ -178,53 +89,17 @@
       <if test="record.partnerInterviewId != null">
         partner_interview_id = #{record.partnerInterviewId},
       </if>
-      <if test="record.partnership != null">
-        partnership = #{record.partnership},
-      </if>
       <if test="record.qualifyVerifyId != null">
         qualify_verify_id = #{record.qualifyVerifyId},
       </if>
       <if test="record.intentionContractNo != null">
         intention_contract_no = #{record.intentionContractNo},
       </if>
-      <if test="record.wantSignTime != null">
+      <if test="record.dataSource != null">
-        want_sign_time = #{record.wantSignTime},
+        data_source = #{record.dataSource},
       </if>
-      <if test="record.partnerFee != null">
+      <if test="record.certificationInfoRecordJson != null">
-        partner_fee = #{record.partnerFee},
+        certification_info_record_json = #{record.certificationInfoRecordJson},
-      </if>
-      <if test="record.securityFund != null">
-        security_fund = #{record.securityFund},
-      </if>
-      <if test="record.technicalServiceFee != null">
-        technical_service_fee = #{record.technicalServiceFee},
-      </if>
-      <if test="record.intentionMoney != null">
-        intention_money = #{record.intentionMoney},
-      </if>
-      <if test="record.intentionSignerUsername != null">
-        intention_signer_username = #{record.intentionSignerUsername},
-      </if>
-      <if test="record.intentionSignerMobile != null">
-        intention_signer_mobile = #{record.intentionSignerMobile},
-      </if>
-      <if test="record.intentionEdu != null">
-        intention_edu = #{record.intentionEdu},
-      </if>
-      <if test="record.realControlUsername != null">
-        real_control_username = #{record.realControlUsername},
-      </if>
-      <if test="record.realControlIdcard != null">
-        real_control_idcard = #{record.realControlIdcard},
-      </if>
-      <if test="record.signerRealControlRelation != null">
-        signer_real_control_relation = #{record.signerRealControlRelation},
-      </if>
-      <if test="record.signerOtherRealControlRelation != null">
-        signer_other_real_control_relation = #{record.signerOtherRealControlRelation},
-      </if>
-      <if test="record.signerRealControlRelationCert != null">
-        signer_real_control_relation_cert = #{record.signerRealControlRelationCert},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime},

coolstore-partner-dao/src/main/resources/mapper/MdmAreaMapper.xml

@@ -0,0 +1,18 @@
+<?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.cool.store.mapper.MdmAreaMapper">
+
+    <!-- 获取 MDM 省级地区数据 -->
+    <select id="getProvince" resultType="com.cool.store.entity.MDMAreaDO">
+        SELECT id, instance_id, code, area_name, parent_code
+            FROM mdm_area
+            WHERE parent_code = '0'
+    </select>
+
+    <!-- 获取子级区域 -->
+    <select id="getSonArea" resultType="com.cool.store.entity.MDMAreaDO">
+        SELECT id, instance_id, code, area_name, parent_code
+            FROM mdm_area
+            WHERE parent_code = #{code}
+    </select>
+</mapper>

coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java

@@ -0,0 +1,12 @@
+package com.cool.store.dto.mdm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AreaSonDTO {
+
+    @ApiModelProperty("父级code")
+    private String code;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java

@@ -30,56 +30,17 @@ public class HyPartnerCertificationInfoDO implements Serializable {
     @ApiModelProperty("hy_partner_interview.id")
     private Long partnerInterviewId;
 
-    @ApiModelProperty("合作关系:1总部下属;2小区代直营;3县代直营;4县代下属;5区代直营;6区代下属")
-    private String partnership;
-
     @ApiModelProperty("资质审核流程id")
     private String qualifyVerifyId;
 
     @ApiModelProperty("意向合同编号")
     private String intentionContractNo;
 
-    @ApiModelProperty("意向签约时间")
-    private Date wantSignTime;
-
     @ApiModelProperty("数据来源")
     private String dataSource;
 
-    @ApiModelProperty("加盟费")
+    @ApiModelProperty("发起资质审核信息记录json字段")
-    private String partnerFee;
+    private String certificationInfoRecordJson;
-
-    @ApiModelProperty("保证金")
-    private String securityFund;
-
-    @ApiModelProperty("技术服务费")
-    private String technicalServiceFee;
-
-    @ApiModelProperty("意向金金额")
-    private String intentionMoney;
-
-    @ApiModelProperty("意向签约人姓名")
-    private String intentionSignerUsername;
-
-    @ApiModelProperty("意向签约人手机号")
-    private String intentionSignerMobile;
-
-    @ApiModelProperty("意向签约人学历")
-    private String intentionEdu;
-
-    @ApiModelProperty("实控人姓名")
-    private String realControlUsername;
-
-    @ApiModelProperty("实控人身份证")
-    private String realControlIdcard;
-
-    @ApiModelProperty("签约人与实控人关系")
-    private String signerRealControlRelation;
-
-    @ApiModelProperty("其他实控人与签约人关系")
-    private String signerOtherRealControlRelation;
-
-    @ApiModelProperty("实控人与签约人关系证明")
-    private String signerRealControlRelationCert;
 
     @ApiModelProperty("创建时间")
     private Date createTime;

coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class ApprovalRegionDO {
+public class MDMAreaDO {
 
     @ApiModelProperty("id")
     private Integer id;
@@ -16,7 +16,7 @@ public class ApprovalRegionDO {
     private String code;
 
     @ApiModelProperty("地区名")
-    private String regionName;
+    private String areaName;
 
     @ApiModelProperty("地区父级编号")
     private String parentCode;

coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java

@@ -0,0 +1,20 @@
+package com.cool.store.service;
+
+import com.cool.store.entity.MDMAreaDO;
+
+import java.util.List;
+
+public interface MDMAreaService {
+
+    /**
+     * 获取省级数据
+     */
+    List<MDMAreaDO> getProvince();
+
+    /**
+     * 获取子级地区
+     * @param code 父级 code
+     */
+    List<MDMAreaDO> getSonArea(String code);
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java

@@ -186,20 +186,7 @@ public class FlowServiceImpl implements FlowService {
         partnerCertificationInfoDO.setPartnerId(request.getPartnerId());
         partnerCertificationInfoDO.setPartnerLineId(Long.valueOf(request.getLineId()));
         partnerCertificationInfoDO.setPartnerInterviewId(Long.valueOf(request.getInterviewId()));
-        partnerCertificationInfoDO.setPartnership(String.valueOf(request.getPartnership()));
+        partnerCertificationInfoDO.setCertificationInfoRecordJson(JSONObject.toJSONString(request));
-        partnerCertificationInfoDO.setWantSignTime(DateUtil.parse(request.getWantSignTime()));
-        partnerCertificationInfoDO.setPartnerFee(request.getPartnerFee().toString());
-        partnerCertificationInfoDO.setSecurityFund(request.getSecurityFund().toString());
-        partnerCertificationInfoDO.setTechnicalServiceFee(request.getTechnicalServiceFee().toString());
-        partnerCertificationInfoDO.setIntentionMoney(request.getIntentionMoney().toString());
-        partnerCertificationInfoDO.setIntentionSignerUsername(request.getIntentionSignerUsername());
-        partnerCertificationInfoDO.setIntentionSignerMobile(request.getIntentionSignerMobile());
-        partnerCertificationInfoDO.setIntentionEdu(request.getIntentionEdu().toString());
-        partnerCertificationInfoDO.setRealControlUsername(request.getRealControlUsername());
-        partnerCertificationInfoDO.setRealControlIdcard(request.getRealControlIdcard());
-        partnerCertificationInfoDO.setSignerRealControlRelation(request.getSignerRealControlRelation().toString());
-        partnerCertificationInfoDO.setSignerOtherRealControlRelation(request.getSignerOtherRealControlRelation());
-        partnerCertificationInfoDO.setSignerRealControlRelationCert(request.getSignerRealControlRelationCert().toString());
         partnerCertificationInfoDO.setCreateTime(new Date());
         partnerCertificationInfoDO.setUpdateTime(new Date());
         //set 资质审核流程id

coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java

@@ -0,0 +1,55 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.constants.RedisConstant;
+import com.cool.store.entity.MDMAreaDO;
+import com.cool.store.mapper.MdmAreaMapper;
+import com.cool.store.service.MDMAreaService;
+import com.cool.store.utils.RedisUtilPool;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class MDMAreaServiceImpl implements MDMAreaService {
+
+    @Autowired
+    private RedisUtilPool redisUtilPool;
+
+    @Autowired
+    private MdmAreaMapper mdmAreaMapper;
+
+    /**
+     * 获取省级数据
+     */
+    @Override
+    public List<MDMAreaDO> getProvince() {
+        String provincesJson = redisUtilPool.getString(RedisConstant.MDM_AREA_PROVINCE);
+        if (StringUtils.isNotEmpty(provincesJson)) {
+            return (List<MDMAreaDO>) JSONObject.parseObject(provincesJson, List.class);
+        }
+        List<MDMAreaDO> areaDOList = mdmAreaMapper.getProvince();
+        //过期时间三小时
+        redisUtilPool.setString(RedisConstant.MDM_AREA_PROVINCE, JSONObject.toJSONString(areaDOList), 3 * 60 * 60);
+        return areaDOList;
+    }
+
+    /**
+     * 获取子级地区
+     * @param code 父级 code
+     */
+    @Override
+    public List<MDMAreaDO> getSonArea(String code) {
+        String provincesJson = redisUtilPool.getString(RedisConstant.MDM_AREA_OTHERS);
+        if (StringUtils.isNotEmpty(provincesJson)) {
+            return (List<MDMAreaDO>) JSONObject.parseObject(provincesJson, List.class);
+        }
+        List<MDMAreaDO> areaDOList = mdmAreaMapper.getSonArea(code);
+        //过期时间三小时
+        redisUtilPool.setString(RedisConstant.MDM_AREA_PROVINCE, JSONObject.toJSONString(areaDOList), 3 * 60 * 60);
+        return areaDOList;
+    }
+
+}

coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java

@@ -0,0 +1,38 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.mdm.AreaSonDTO;
+import com.cool.store.entity.MDMAreaDO;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.MDMAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/mdm/area")
+@Api(tags = "MDM省市信息")
+public class MDMAreaController {
+
+    @Autowired
+    private MDMAreaService mdmAreaService;
+
+    @PostMapping("/province")
+    @ApiOperation("获取MDM省级信息")
+    public ResponseResult<List<MDMAreaDO>> getProvince() {
+        return ResponseResult.success(mdmAreaService.getProvince());
+    }
+
+    @PostMapping("/son")
+    @ApiOperation("获取子级区域数据")
+    private ResponseResult<List<MDMAreaDO>> getSonArea(@RequestBody AreaSonDTO areaSon) {
+        return ResponseResult.success(mdmAreaService.getSonArea(areaSon.getCode()));
+    }
+
+
+}