资质审核

coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java

@@ -53,11 +53,11 @@ public enum ShopSubStageStatusEnum {
     SHOP_SUB_STAGE_STATUS_85(ShopSubStageEnum.SHOP_STAGE_8, 850, "退回", Boolean.FALSE),
 
     //设计阶段
-    SHOP_SUB_STAGE_STATUS_90(ShopSubStageEnum.SHOP_STAGE_9, 900, "进行中", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_90(ShopSubStageEnum.SHOP_STAGE_9, 900, "待上传", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_92(ShopSubStageEnum.SHOP_STAGE_9, 920, "待确认", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_91(ShopSubStageEnum.SHOP_STAGE_9, 910, "已完成", Boolean.TRUE),
 
     //施工阶段
-    SHOP_SUB_STAGE_STATUS_110(ShopSubStageEnum.SHOP_STAGE_11, 1100, "待施工", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_111(ShopSubStageEnum.SHOP_STAGE_11, 1110, "施工中", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_112(ShopSubStageEnum.SHOP_STAGE_11, 1120, "已完成", Boolean.TRUE),
 

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

@@ -0,0 +1,30 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.DecorationDesignInfoDO;
+import com.cool.store.mapper.DecorationDesignInfoMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/6/20 17:23
+ * @Version 1.0
+ */
+@Repository
+public class DecorationDesignInfoDAO {
+
+    @Resource
+    DecorationDesignInfoMapper decorationDesignInfoMapper;
+
+    private DecorationDesignInfoDO getById(Long id){
+        if(id == null){
+            return null;
+        }
+        return decorationDesignInfoMapper.selectByPrimaryKey(id);
+    }
+
+
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.MemberQuestionDO;
+import com.cool.store.entity.QualificationsInfoDO;
+import com.cool.store.mapper.QualificationsInfoMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/6/21 15:26
+ * @Version 1.0
+ */
+@Repository
+public class QualificationsInfoDAO {
+
+    @Resource
+    private QualificationsInfoMapper qualificationsInfoMapper;
+
+
+    /**
+     * 新增与更新
+     * @param request
+     * @return
+     */
+    public boolean insertOrUpdate(QualificationsInfoDO request){
+       return qualificationsInfoMapper.insertOrUpdate(request);
+    }
+
+    public void updateAuditIdByLineId(Long auditId, Long id){
+        if (id==null||auditId==null){
+            return;
+        }
+        qualificationsInfoMapper.updateAuditIdByLineId(auditId, id);
+    }
+
+    public QualificationsInfoDO getByLineId(@Param("lineId") Long lineId){
+        if (lineId==null){
+            return new QualificationsInfoDO();
+        }
+        return qualificationsInfoMapper.getByLineId(lineId);
+    }
+}

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

@@ -0,0 +1,7 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.DecorationDesignInfoDO;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface DecorationDesignInfoMapper extends Mapper<DecorationDesignInfoDO> {
+}

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

@@ -0,0 +1,25 @@
+package com.cool.store.mapper;
+
+import com.cool.store.dao.QualificationsInfoDAO;
+import com.cool.store.entity.MemberQuestionDO;
+import com.cool.store.entity.QualificationsInfoDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface QualificationsInfoMapper extends Mapper<QualificationsInfoDO> {
+
+
+    /**
+     * 新增与更新
+     * @param request
+     * @return
+     */
+    boolean insertOrUpdate(@Param("request") QualificationsInfoDO request);
+
+    void updateAuditIdByLineId(@Param("auditId") Long auditId,
+                               @Param("lineId") Long id);
+
+    QualificationsInfoDO getByLineId(@Param("lineId") Long lineId);
+
+
+}

coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.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.DecorationDesignInfoMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.DecorationDesignInfoDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="shop_id" jdbcType="BIGINT" property="shopId" />
+    <result column="quotation_url" jdbcType="VARCHAR" property="quotationUrl" />
+    <result column="design_url" jdbcType="VARCHAR" property="designUrl" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="partner_acceptance_signatures" jdbcType="VARCHAR" property="partnerAcceptanceSignatures" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+  </resultMap>
+</mapper>

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

@@ -0,0 +1,161 @@
+<?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.QualificationsInfoMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.QualificationsInfoDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="audit_id" jdbcType="BIGINT" property="auditId" />
+    <result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
+    <result column="line_id" jdbcType="BIGINT" property="lineId" />
+    <result column="join_type" jdbcType="BIT" property="joinType" />
+    <result column="id_card_no" jdbcType="VARCHAR" property="idCardNo" />
+    <result column="front_of_id_card" jdbcType="VARCHAR" property="frontOfIdCard" />
+    <result column="back_of_id_card" jdbcType="VARCHAR" property="backOfIdCard" />
+    <result column="marital_status" jdbcType="BIT" property="maritalStatus" />
+    <result column="education_level" jdbcType="BIT" property="educationLevel" />
+    <result column="household_registration_address" jdbcType="VARCHAR" property="householdRegistrationAddress" />
+    <result column="settlement_card_no" jdbcType="VARCHAR" property="settlementCardNo" />
+    <result column="settlement_opening_bank" jdbcType="VARCHAR" property="settlementOpeningBank" />
+    <result column="settlement_card_pic" jdbcType="VARCHAR" property="settlementCardPic" />
+    <result column="entrepreneurial_experience" jdbcType="BIT" property="entrepreneurialExperience" />
+    <result column="previously_engaged_industries" jdbcType="VARCHAR" property="previouslyEngagedIndustries" />
+    <result column="bank_statements_pic" jdbcType="VARCHAR" property="bankStatementsPic" />
+    <result column="old_brands" jdbcType="VARCHAR" property="oldBrands" />
+    <result column="new_brands" jdbcType="VARCHAR" property="newBrands" />
+    <result column="enterprise_name" jdbcType="VARCHAR" property="enterpriseName" />
+    <result column="company_registered_address" jdbcType="VARCHAR" property="companyRegisteredAddress" />
+    <result column="office_address" jdbcType="VARCHAR" property="officeAddress" />
+    <result column="legal_name" jdbcType="VARCHAR" property="legalName" />
+    <result column="legal_id_card_no" jdbcType="VARCHAR" property="legalIdCardNo" />
+    <result column="legal_id_card_front" jdbcType="VARCHAR" property="legalIdCardFront" />
+    <result column="legal_id_card_back" jdbcType="VARCHAR" property="legalIdCardBack" />
+    <result column="business_leader_name" jdbcType="VARCHAR" property="businessLeaderName" />
+    <result column="business_leader_mobile" jdbcType="VARCHAR" property="businessLeaderMobile" />
+    <result column="financial_manager_name" jdbcType="VARCHAR" property="financialManagerName" />
+    <result column="financial_manager_mobile" jdbcType="VARCHAR" property="financialManagerMobile" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+  </resultMap>
+
+  <insert id="insertOrUpdate" keyProperty="id" parameterType="com.cool.store.entity.QualificationsInfoDO" useGeneratedKeys="true">
+    INSERT INTO xfsg_qualifications_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="request.auditId != null">audit_id,</if>
+      <if test="request.partnerId != null">partner_id,</if>
+      <if test="request.lineId != null">line_id,</if>
+      <if test="request.joinType != null">join_type,</if>
+      <if test="request.idCardNo != null">id_card_no,</if>
+      <if test="request.frontOfIdCard != null">front_of_id_card,</if>
+      <if test="request.backOfIdCard != null">back_of_id_card,</if>
+      <if test="request.maritalStatus != null">marital_status,</if>
+      <if test="request.educationLevel != null">education_level,</if>
+      <if test="request.householdRegistrationAddress != null">household_registration_address,</if>
+      <if test="request.settlementCardNo != null">settlement_card_no,</if>
+      <if test="request.settlementOpeningBank != null">settlement_opening_bank,</if>
+      <if test="request.settlementCardPic != null">settlement_card_pic,</if>
+      <if test="request.entrepreneurialExperience != null">entrepreneurial_experience,</if>
+      <if test="request.previouslyEngagedIndustries != null">previously_engaged_industries,</if>
+      <if test="request.bankStatementsPic != null">bank_statements_pic,</if>
+      <if test="request.oldBrands != null">old_brands,</if>
+      <if test="request.newBrands != null">new_brands,</if>
+      <if test="request.enterpriseName != null">enterprise_name,</if>
+      <if test="request.companyRegisteredAddress != null">company_registered_address,</if>
+      <if test="request.officeAddress != null">office_address,</if>
+      <if test="request.legalName != null">legal_name,</if>
+      <if test="request.legalIdCardNo != null">legal_id_card_no,</if>
+      <if test="request.legalIdCardFront != null">legal_id_card_front,</if>
+      <if test="request.legalIdCardBack != null">legal_id_card_back,</if>
+      <if test="request.businessLeaderName != null">business_leader_name,</if>
+      <if test="request.businessLeaderMobile != null">business_leader_mobile,</if>
+      <if test="request.financialManagerName != null">financial_manager_name,</if>
+      <if test="request.financialManagerMobile != null">financial_manager_mobile,</if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="request.auditId != null">#{request.auditId},</if>
+      <if test="request.partnerId != null">#{request.partnerId},</if>
+      <if test="request.lineId != null">#{request.lineId},</if>
+      <if test="request.joinType != null">#{request.joinType},</if>
+      <if test="request.idCardNo != null">#{request.idCardNo},</if>
+      <if test="request.frontOfIdCard != null">#{request.frontOfIdCard},</if>
+      <if test="request.backOfIdCard != null">#{request.backOfIdCard},</if>
+      <if test="request.maritalStatus != null">#{request.maritalStatus},</if>
+      <if test="request.educationLevel != null">#{request.educationLevel},</if>
+      <if test="request.householdRegistrationAddress != null">#{request.householdRegistrationAddress},</if>
+      <if test="request.settlementCardNo != null">#{request.settlementCardNo},</if>
+      <if test="request.settlementOpeningBank != null">#{request.settlementOpeningBank},</if>
+      <if test="request.settlementCardPic != null">#{request.settlementCardPic},</if>
+      <if test="request.entrepreneurialExperience != null">#{request.entrepreneurialExperience},</if>
+      <if test="request.previouslyEngagedIndustries != null">#{request.previouslyEngagedIndustries},</if>
+      <if test="request.bankStatementsPic != null">#{request.bankStatementsPic},</if>
+      <if test="request.oldBrands != null">#{request.oldBrands},</if>
+      <if test="request.newBrands != null">#{request.newBrands},</if>
+      <if test="request.enterpriseName != null">#{request.enterpriseName},</if>
+      <if test="request.companyRegisteredAddress != null">#{request.companyRegisteredAddress},</if>
+      <if test="request.officeAddress != null">#{request.officeAddress},</if>
+      <if test="request.legalName != null">#{request.legalName},</if>
+      <if test="request.legalIdCardNo != null">#{request.legalIdCardNo},</if>
+      <if test="request.legalIdCardFront != null">#{request.legalIdCardFront},</if>
+      <if test="request.legalIdCardBack != null">#{request.legalIdCardBack},</if>
+      <if test="request.businessLeaderName != null">#{request.businessLeaderName},</if>
+      <if test="request.businessLeaderMobile != null">#{request.businessLeaderMobile},</if>
+      <if test="request.financialManagerName != null">#{request.financialManagerName},</if>
+      <if test="request.financialManagerMobile != null">#{request.financialManagerMobile},</if>
+    </trim>
+    ON DUPLICATE KEY UPDATE
+    <trim suffixOverrides=",">
+      <if test="request.auditId != null">audit_id = #{request.auditId},</if>
+      <if test="request.partnerId != null">partner_id = #{request.partnerId},</if>
+      <if test="request.lineId != null">line_id = #{request.lineId},</if>
+      <if test="request.joinType != null">join_type = #{request.joinType},</if>
+      <if test="request.idCardNo != null">id_card_no = #{request.idCardNo},</if>
+      <if test="request.frontOfIdCard != null">front_of_id_card = #{request.frontOfIdCard},</if>
+      <if test="request.backOfIdCard != null">back_of_id_card = #{request.backOfIdCard},</if>
+      <if test="request.maritalStatus != null">marital_status = #{request.maritalStatus},</if>
+      <if test="request.educationLevel != null">education_level = #{request.educationLevel},</if>
+      <if test="request.householdRegistrationAddress != null">household_registration_address = #{request.householdRegistrationAddress},</if>
+      <if test="request.settlementCardNo != null">settlement_card_no = #{request.settlementCardNo},</if>
+      <if test="request.settlementOpeningBank != null">settlement_opening_bank = #{request.settlementOpeningBank},</if>
+      <if test="request.settlementCardPic != null">settlement_card_pic = #{request.settlementCardPic},</if>
+      <if test="request.entrepreneurialExperience != null">entrepreneurial_experience = #{request.entrepreneurialExperience},</if>
+      <if test="request.previouslyEngagedIndustries != null">previously_engaged_industries = #{request.previouslyEngagedIndustries},</if>
+      <if test="request.bankStatementsPic != null">bank_statements_pic = #{request.bankStatementsPic},</if>
+      <if test="request.oldBrands != null">old_brands = #{request.oldBrands},</if>
+      <if test="request.newBrands != null">new_brands = #{request.newBrands},</if>
+      <if test="request.enterpriseName != null">enterprise_name = #{request.enterpriseName},</if>
+      <if test="request.companyRegisteredAddress != null">company_registered_address = #{request.companyRegisteredAddress},</if>
+      <if test="request.officeAddress != null">office_address = #{request.officeAddress},</if>
+      <if test="request.legalName != null">legal_name = #{request.legalName},</if>
+      <if test="request.legalIdCardNo != null">legal_id_card_no = #{request.legalIdCardNo},</if>
+      <if test="request.legalIdCardFront != null">legal_id_card_front = #{request.legalIdCardFront},</if>
+      <if test="request.legalIdCardBack != null">legal_id_card_back = #{request.legalIdCardBack},</if>
+      <if test="request.businessLeaderName != null">business_leader_name = #{request.businessLeaderName},</if>
+      <if test="request.businessLeaderMobile != null">business_leader_mobile = #{request.businessLeaderMobile},</if>
+      <if test="request.financialManagerName != null">financial_manager_name = #{request.financialManagerName},</if>
+      <if test="request.financialManagerMobile != null">financial_manager_mobile = #{request.financialManagerMobile},</if>
+    </trim>
+  </insert>
+
+  <update id="updateAuditIdByLineId">
+    update xfsg_qualifications_info
+    set audit_id = #{auditId}
+    where line_id = #{lineId}
+  </update>
+
+  <select id="getByLineId" resultType="com.cool.store.entity.QualificationsInfoDO">
+    select
+    *
+    from xfsg_qualifications_info
+    where line_id = #{lineId}
+    and deleted = 0
+  </select>
+
+
+
+
+
+
+
+</mapper>

coolstore-partner-dao/src/test/resources/mybatis-generator.properties

@@ -1,8 +1,8 @@
 jdbc.driver = com.mysql.cj.jdbc.Driver
-jdbc.url = jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_69?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+jdbc.url = jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_74?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
 jdbc.user= coolstore
 jdbc.password = CSCErYcXniNYm7bT
 
-table.name = xfsg_open_new_shop_record
+table.name = xfsg_qualifications_info
-table.object.class = OpenNewShopRecordDO
+table.object.class = QualificationsInfoDO
-table.mapper = OpenNewShopRecordMapper
+table.mapper = QualificationsInfoMapper

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

@@ -0,0 +1,215 @@
+package com.cool.store.entity;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "xfsg_decoration_design_info")
+public class DecorationDesignInfoDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * xfsg_shop_info.id
+     */
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /**
+     * 报价单
+     */
+    @Column(name = "quotation_url")
+    private String quotationUrl;
+
+    /**
+     * 设计图
+     */
+    @Column(name = "design_url")
+    private String designUrl;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
+     */
+    @Column(name = "partner_acceptance_signatures")
+    private String partnerAcceptanceSignatures;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 是否删除：0.否 1.是
+     */
+    private Boolean deleted;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取xfsg_shop_info.id
+     *
+     * @return shop_id - xfsg_shop_info.id
+     */
+    public Long getShopId() {
+        return shopId;
+    }
+
+    /**
+     * 设置xfsg_shop_info.id
+     *
+     * @param shopId xfsg_shop_info.id
+     */
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    /**
+     * 获取报价单
+     *
+     * @return quotation_url - 报价单
+     */
+    public String getQuotationUrl() {
+        return quotationUrl;
+    }
+
+    /**
+     * 设置报价单
+     *
+     * @param quotationUrl 报价单
+     */
+    public void setQuotationUrl(String quotationUrl) {
+        this.quotationUrl = quotationUrl;
+    }
+
+    /**
+     * 获取设计图
+     *
+     * @return design_url - 设计图
+     */
+    public String getDesignUrl() {
+        return designUrl;
+    }
+
+    /**
+     * 设置设计图
+     *
+     * @param designUrl 设计图
+     */
+    public void setDesignUrl(String designUrl) {
+        this.designUrl = designUrl;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return remark - 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
+     *
+     * @return partner_acceptance_signatures - 加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
+     */
+    public String getPartnerAcceptanceSignatures() {
+        return partnerAcceptanceSignatures;
+    }
+
+    /**
+     * 设置加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
+     *
+     * @param partnerAcceptanceSignatures 加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
+     */
+    public void setPartnerAcceptanceSignatures(String partnerAcceptanceSignatures) {
+        this.partnerAcceptanceSignatures = partnerAcceptanceSignatures;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return update_time - 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取是否删除：0.否 1.是
+     *
+     * @return deleted - 是否删除：0.否 1.是
+     */
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    /**
+     * 设置是否删除：0.否 1.是
+     *
+     * @param deleted 是否删除：0.否 1.是
+     */
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+}

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

@@ -0,0 +1,207 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "xfsg_qualifications_info")
+@Data
+public class QualificationsInfoDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * xfsg_line_audit_info.id
+     */
+    @Column(name = "audit_id")
+    private Long auditId;
+
+    /**
+     * xfsg_partner_user_info.partner_id
+     */
+    @Column(name = "partner_id")
+    private String partnerId;
+
+    /**
+     * xfsg_line_info.id
+     */
+    @Column(name = "line_id")
+    private Long lineId;
+
+    /**
+     * 加盟身份 1个人加盟 2企业加盟
+     */
+    @Column(name = "join_type")
+    private Integer joinType;
+
+    /**
+     * 身份证号码/统一社会信用代码
+     */
+    @Column(name = "id_card_no")
+    private String idCardNo;
+
+    /**
+     * 身份证正面
+     */
+    @Column(name = "front_of_id_card")
+    private String frontOfIdCard;
+
+    /**
+     * 身份证正面
+     */
+    @Column(name = "back_of_id_card")
+    private String backOfIdCard;
+
+    /**
+     * 1-未婚 2-已婚 3-离婚 4-丧偶
+     */
+    @Column(name = "marital_status")
+    private Boolean maritalStatus;
+
+    /**
+     * 1-初中及以下 2-高中 3-专科 4-本科及以上
+     */
+    @Column(name = "education_level")
+    private Boolean educationLevel;
+
+    /**
+     * 户口地址
+     */
+    @Column(name = "household_registration_address")
+    private String householdRegistrationAddress;
+
+    /**
+     * 结算卡卡号
+     */
+    @Column(name = "settlement_card_no")
+    private String settlementCardNo;
+
+    /**
+     * 结算卡开户行
+     */
+    @Column(name = "settlement_opening_bank")
+    private String settlementOpeningBank;
+
+    /**
+     * 结算卡照片
+     */
+    @Column(name = "settlement_card_pic")
+    private String settlementCardPic;
+
+    /**
+     * 创业经历 0-无 1-有
+     */
+    @Column(name = "entrepreneurial_experience")
+    private Integer entrepreneurialExperience;
+
+    /**
+     * 以往从事行业
+     */
+    @Column(name = "previously_engaged_industries")
+    private String previouslyEngagedIndustries;
+
+    /**
+     * 银行流水图片
+     */
+    @Column(name = "bank_statements_pic")
+    private String bankStatementsPic;
+
+    /**
+     * 曾经经营过的品牌
+     */
+    @Column(name = "old_brands")
+    private String oldBrands;
+
+    /**
+     * 目前经营的品牌
+     */
+    @Column(name = "new_brands")
+    private String newBrands;
+
+    /**
+     * 公司名称
+     */
+    @Column(name = "enterprise_name")
+    private String enterpriseName;
+
+    /**
+     * 注册地址
+     */
+    @Column(name = "company_registered_address")
+    private String companyRegisteredAddress;
+
+    /**
+     * 办公地址
+     */
+    @Column(name = "office_address")
+    private String officeAddress;
+
+    /**
+     * 法人姓名
+     */
+    @Column(name = "legal_name")
+    private String legalName;
+
+    /**
+     * 法人身份证号码
+     */
+    @Column(name = "legal_id_card_no")
+    private String legalIdCardNo;
+
+    /**
+     * 身份证正面
+     */
+    @Column(name = "legal_id_card_front")
+    private String legalIdCardFront;
+
+    /**
+     * 身份证正面
+     */
+    @Column(name = "legal_id_card_back")
+    private String legalIdCardBack;
+
+    /**
+     * 业务负责人姓名
+     */
+    @Column(name = "business_leader_name")
+    private String businessLeaderName;
+
+    /**
+     * 业务负责人联系方式
+     */
+    @Column(name = "business_leader_mobile")
+    private String businessLeaderMobile;
+
+    /**
+     * 业务负责人姓名
+     */
+    @Column(name = "financial_manager_name")
+    private String financialManagerName;
+
+    /**
+     * 业务负责人联系方式
+     */
+    @Column(name = "financial_manager_mobile")
+    private String financialManagerMobile;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 是否删除：0.否 1.是
+     */
+    private Boolean deleted;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java

@@ -2,7 +2,7 @@ package com.cool.store.request;
 
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.entity.MemberQuestionDO;
-import io.swagger.annotations.ApiModel;
+import com.cool.store.entity.QualificationsInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -34,30 +34,56 @@ public class JoinIntentionRequest {
     private String liveAddress;
     @ApiModelProperty("线索审核信息id")
     private Long auditId;
-    @ApiModelProperty("职业状态 1：在职 2：个体 3：自己开公司 0：待业")
+    @ApiModelProperty("身份证号码/统一社会信用代码")
-    private Integer careerStatus;
+    private String idCardNo;
-    @ApiModelProperty("教育程度 1：小学 2：初中 3：高中 4大学及以上")
+    @ApiModelProperty("身份证正面")
-    private Integer educationLevel;
+    private String frontOfIdCard;
-    @ApiModelProperty("家庭年收入 1：10-20万 2：20-30万 3：30-50万 4：50万以上")
+    @ApiModelProperty("身份证反面")
-    private String annualIncome;
+    private String backOfIdCard;
-    @ApiModelProperty("是否有合伙人 1：是 0：否")
+    @ApiModelProperty("婚姻状态 1-未婚 2-已婚 3-离婚 4-丧偶")
-    private Integer hasPartner;
+    private Boolean maritalStatus;
-    @ApiModelProperty("资金来源 1：自有资金 2：合伙资金 3：借贷")
+    @ApiModelProperty("学历 1-初中及以下 2-高中 3-专科 4-本科及以上")
-    private Integer capitalSource;
+    private Boolean educationLevel;
-    @ApiModelProperty("经营方式 1：自己独立经营 2：和家人一起经营 3：和合伙人一起经营 4：只投资让他人经营")
+    @ApiModelProperty("户口地址")
-    private Integer businessMode;
+    private String householdRegistrationAddress;
-    @ApiModelProperty("是否有加盟品牌经营的经验 1：无  2：单店经验 3：多店经验 4：多店连锁经验")
+    @ApiModelProperty("结算卡卡号")
-    private Integer joinExperience;
+    private String settlementCardNo;
-    @ApiModelProperty("是否有水果行业经营的经验 1：无  2：单店经验 3：多店经验 4：多店连锁经验")
+    @ApiModelProperty("结算卡开户行")
-    private Integer fruitIndustryExperience;
+    private String settlementOpeningBank;
-    @ApiModelProperty("店铺情况 1:自有店铺 2：自有意向店铺 3：无意向店铺" )
+    @ApiModelProperty("结算卡照片")
-    private String storeCondition;
+    private String settlementCardPic;
-    @ApiModelProperty("预期回本的最长周期 1：1年半以上 2：1年半内 3：1年内 4：半年内")
+    @ApiModelProperty("创业经历 0-无 1-有")
-    private String paybackPeriod;
+    private Integer entrepreneurialExperience;
-    @ApiModelProperty("是否严格遵守管理标准 1：是 2：否")
+    @ApiModelProperty("以往从事行业")
-    private Integer followsManagementStandard;
+    private String previouslyEngagedIndustries;
-    @ApiModelProperty("是否能参加认证培训 1：是 2：否")
+    @ApiModelProperty("银行流水图片")
-    private Integer canTraining;
+    private String bankStatementsPic;
+    @ApiModelProperty("曾经经营过的品牌")
+    private String oldBrands;
+    @ApiModelProperty("目前经营的品牌")
+    private String newBrands;
+    @ApiModelProperty("公司名称")
+    private String enterpriseName;
+    @ApiModelProperty("注册地址")
+    private String companyRegisteredAddress;
+    @ApiModelProperty("办公地址")
+    private String officeAddress;
+    @ApiModelProperty("法人姓名")
+    private String legalName;
+    @ApiModelProperty("法人身份证号码")
+    private String legalIdCardNo;
+    @ApiModelProperty("法人身份证正面")
+    private String legalIdCardFront;
+    @ApiModelProperty("法人身份证反面")
+    private String legalIdCardBack;
+    @ApiModelProperty("业务负责人姓名")
+    private String businessLeaderName;
+    @ApiModelProperty("业务负责人联系方式")
+    private String businessLeaderMobile;
+    @ApiModelProperty("业务负责人姓名")
+    private String financialManagerName;
+    @ApiModelProperty("业务负责人联系方式")
+    private String financialManagerMobile;
 
     public LineInfoDO toLineInfoDO() {
         LineInfoDO lineInfoDO = new LineInfoDO();
@@ -72,25 +98,39 @@ public class JoinIntentionRequest {
     }
 
 
-    public MemberQuestionDO toMemberQuestionDO() {
+    public QualificationsInfoDO toQualificationsInfoDO() {
-        MemberQuestionDO memberQuestionDO = new MemberQuestionDO();
+        QualificationsInfoDO qualificationsInfoDO = new QualificationsInfoDO();
-        memberQuestionDO.setId(this.id);
+        qualificationsInfoDO.setId(this.id);
-        memberQuestionDO.setAuditId(this.auditId);
+        qualificationsInfoDO.setAuditId(this.auditId);
-        memberQuestionDO.setPartnerId(this.partnerId);
+        qualificationsInfoDO.setPartnerId(this.partnerId);
-        memberQuestionDO.setLineId(this.lineId);
+        qualificationsInfoDO.setLineId(this.lineId);
-        memberQuestionDO.setCareerStatus(this.careerStatus);
+        qualificationsInfoDO.setJoinType(this.joinType);
-        memberQuestionDO.setEducationLevel(this.educationLevel);
+        //对request里面所有的字段set
-        memberQuestionDO.setAnnualIncome(this.annualIncome);
+        qualificationsInfoDO.setIdCardNo(this.idCardNo);
-        memberQuestionDO.setHasPartner(this.hasPartner);
+        qualificationsInfoDO.setBackOfIdCard(this.backOfIdCard);
-        memberQuestionDO.setCapitalSource(this.capitalSource);
+        qualificationsInfoDO.setFrontOfIdCard(this.frontOfIdCard);
-        memberQuestionDO.setBusinessMode(this.businessMode);
+        qualificationsInfoDO.setMaritalStatus(this.maritalStatus);
-        memberQuestionDO.setJoinExperience(this.joinExperience);
+        qualificationsInfoDO.setEducationLevel(this.educationLevel);
-        memberQuestionDO.setFruitIndustryExperience(this.fruitIndustryExperience);
+        qualificationsInfoDO.setHouseholdRegistrationAddress(this.householdRegistrationAddress);
-        memberQuestionDO.setStoreCondition(this.storeCondition);
+        qualificationsInfoDO.setSettlementCardNo(this.settlementCardNo);
-        memberQuestionDO.setPaybackPeriod(this.paybackPeriod);
+        qualificationsInfoDO.setSettlementCardPic(this.settlementCardPic);
-        memberQuestionDO.setFollowsManagementStandard(this.followsManagementStandard);
+        qualificationsInfoDO.setSettlementOpeningBank(this.settlementOpeningBank);
-        memberQuestionDO.setCanTraining(this.canTraining);
+        qualificationsInfoDO.setEntrepreneurialExperience(this.entrepreneurialExperience);
-        memberQuestionDO.setJoinType(this.joinType);
+        qualificationsInfoDO.setPreviouslyEngagedIndustries(this.previouslyEngagedIndustries);
-        return memberQuestionDO;
+        qualificationsInfoDO.setBankStatementsPic(this.bankStatementsPic);
+        qualificationsInfoDO.setOldBrands(this.oldBrands);
+        qualificationsInfoDO.setNewBrands(this.newBrands);
+        qualificationsInfoDO.setEnterpriseName(this.enterpriseName);
+        qualificationsInfoDO.setCompanyRegisteredAddress(this.companyRegisteredAddress);
+        qualificationsInfoDO.setOfficeAddress(this.officeAddress);
+        qualificationsInfoDO.setLegalName(this.legalName);
+        qualificationsInfoDO.setLegalIdCardNo(this.legalIdCardNo);
+        qualificationsInfoDO.setLegalIdCardBack(this.legalIdCardBack);
+        qualificationsInfoDO.setLegalIdCardFront(this.legalIdCardFront);
+        qualificationsInfoDO.setBusinessLeaderName(this.businessLeaderName);
+        qualificationsInfoDO.setBusinessLeaderMobile(this.businessLeaderMobile);
+        qualificationsInfoDO.setFinancialManagerName(this.financialManagerName);
+        qualificationsInfoDO.setFinancialManagerMobile(this.financialManagerMobile);
+        return qualificationsInfoDO;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java

@@ -2,6 +2,7 @@ package com.cool.store.vo;
 
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.entity.MemberQuestionDO;
+import com.cool.store.entity.QualificationsInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -34,30 +35,56 @@ public class PartnerBaseInfoVO {
 
     @ApiModelProperty("线索审核信息id")
     private Long auditId;
-    @ApiModelProperty("职业状态 1：在职 2：个体 3：自己开公司 0：待业")
+    @ApiModelProperty("身份证号码/统一社会信用代码")
-    private Integer careerStatus;
+    private String idCardNo;
-    @ApiModelProperty("教育程度 1：小学 2：初中 3：高中 4大学及以上")
+    @ApiModelProperty("身份证正面")
-    private Integer educationLevel;
+    private String frontOfIdCard;
-    @ApiModelProperty("家庭年收入 1：10-20万 2：20-30万 3：30-50万 4：50万以上")
+    @ApiModelProperty("身份证反面")
-    private Integer annualIncome;
+    private String backOfIdCard;
-    @ApiModelProperty("是否有合伙人 1：是 0：否")
+    @ApiModelProperty("婚姻状态 1-未婚 2-已婚 3-离婚 4-丧偶")
-    private Integer hasPartner;
+    private Boolean maritalStatus;
-    @ApiModelProperty("资金来源 1：自有资金 2：合伙资金 3：借贷")
+    @ApiModelProperty("学历 1-初中及以下 2-高中 3-专科 4-本科及以上")
-    private Integer capitalSource;
+    private Boolean educationLevel;
-    @ApiModelProperty("经营方式 1：自己独立经营 2：和家人一起经营 3：和合伙人一起经营 4：只投资让他人经营")
+    @ApiModelProperty("户口地址")
-    private Integer businessMode;
+    private String householdRegistrationAddress;
-    @ApiModelProperty("是否有加盟品牌经营的经验 1：无  2：单店经验 3：多店经验 4：多店连锁经验")
+    @ApiModelProperty("结算卡卡号")
-    private Integer joinExperience;
+    private String settlementCardNo;
-    @ApiModelProperty("是否有水果行业经营的经验 1：无  2：单店经验 3：多店经验 4：多店连锁经验")
+    @ApiModelProperty("结算卡开户行")
-    private Integer fruitIndustryExperience;
+    private String settlementOpeningBank;
-    @ApiModelProperty("店铺情况 1:自有店铺 2：自有意向店铺 3：无意向店铺" )
+    @ApiModelProperty("结算卡照片")
-    private Integer storeCondition;
+    private String settlementCardPic;
-    @ApiModelProperty("预期回本的最长周期 1：1年半以上 2：1年半内 3：1年内 4：半年内")
+    @ApiModelProperty("创业经历 0-无 1-有")
-    private Integer paybackPeriod;
+    private Integer entrepreneurialExperience;
-    @ApiModelProperty("是否严格遵守管理标准 1：是 2：否")
+    @ApiModelProperty("以往从事行业")
-    private Integer followsManagementStandard;
+    private String previouslyEngagedIndustries;
-    @ApiModelProperty("是否能参加认证培训 1：是 2：否")
+    @ApiModelProperty("银行流水图片")
-    private Integer canTraining;
+    private String bankStatementsPic;
+    @ApiModelProperty("曾经经营过的品牌")
+    private String oldBrands;
+    @ApiModelProperty("目前经营的品牌")
+    private String newBrands;
+    @ApiModelProperty("公司名称")
+    private String enterpriseName;
+    @ApiModelProperty("注册地址")
+    private String companyRegisteredAddress;
+    @ApiModelProperty("办公地址")
+    private String officeAddress;
+    @ApiModelProperty("法人姓名")
+    private String legalName;
+    @ApiModelProperty("法人身份证号码")
+    private String legalIdCardNo;
+    @ApiModelProperty("法人身份证正面")
+    private String legalIdCardFront;
+    @ApiModelProperty("法人身份证反面")
+    private String legalIdCardBack;
+    @ApiModelProperty("业务负责人姓名")
+    private String businessLeaderName;
+    @ApiModelProperty("业务负责人联系方式")
+    private String businessLeaderMobile;
+    @ApiModelProperty("业务负责人姓名")
+    private String financialManagerName;
+    @ApiModelProperty("业务负责人联系方式")
+    private String financialManagerMobile;
 
     private Date createTime;
 
@@ -74,27 +101,37 @@ public class PartnerBaseInfoVO {
 
 
 
-    public static PartnerBaseInfoVO from(MemberQuestionDO memberQuestionDO, LineInfoDO lineInfoDO) {
+    public static PartnerBaseInfoVO from(QualificationsInfoDO qualificationsInfoDO, LineInfoDO lineInfoDO) {
-        if (Objects.isNull(memberQuestionDO) && Objects.isNull(lineInfoDO)) {
+        if (Objects.isNull(qualificationsInfoDO) && Objects.isNull(lineInfoDO)) {
             return null;
         }
         PartnerBaseInfoVO partnerBaseInfoVO = new PartnerBaseInfoVO();
-        // MemberQuestionDO
+        partnerBaseInfoVO.setIdCardNo(qualificationsInfoDO.getIdCardNo());
-        partnerBaseInfoVO.setPartnerId(memberQuestionDO.getPartnerId());
+        partnerBaseInfoVO.setBackOfIdCard(qualificationsInfoDO.getBackOfIdCard());
-        partnerBaseInfoVO.setAuditId(memberQuestionDO.getAuditId());
+        partnerBaseInfoVO.setFrontOfIdCard(qualificationsInfoDO.getFrontOfIdCard());
-        partnerBaseInfoVO.setCareerStatus(memberQuestionDO.getCareerStatus());
+        partnerBaseInfoVO.setMaritalStatus(qualificationsInfoDO.getMaritalStatus());
-        partnerBaseInfoVO.setEducationLevel(memberQuestionDO.getEducationLevel());
+        partnerBaseInfoVO.setEducationLevel(qualificationsInfoDO.getEducationLevel());
-        partnerBaseInfoVO.setAnnualIncome(Integer.valueOf(memberQuestionDO.getAnnualIncome()));
+        partnerBaseInfoVO.setHouseholdRegistrationAddress(qualificationsInfoDO.getHouseholdRegistrationAddress());
-        partnerBaseInfoVO.setHasPartner(memberQuestionDO.getHasPartner());
+        partnerBaseInfoVO.setSettlementCardNo(qualificationsInfoDO.getSettlementCardNo());
-        partnerBaseInfoVO.setCapitalSource(memberQuestionDO.getCapitalSource());
+        partnerBaseInfoVO.setSettlementCardPic(qualificationsInfoDO.getSettlementCardPic());
-        partnerBaseInfoVO.setBusinessMode(memberQuestionDO.getBusinessMode());
+        partnerBaseInfoVO.setSettlementOpeningBank(qualificationsInfoDO.getSettlementOpeningBank());
-        partnerBaseInfoVO.setJoinExperience(memberQuestionDO.getJoinExperience());
+        partnerBaseInfoVO.setEntrepreneurialExperience(qualificationsInfoDO.getEntrepreneurialExperience());
-        partnerBaseInfoVO.setFruitIndustryExperience(memberQuestionDO.getFruitIndustryExperience());
+        partnerBaseInfoVO.setPreviouslyEngagedIndustries(qualificationsInfoDO.getPreviouslyEngagedIndustries());
-        partnerBaseInfoVO.setStoreCondition(Integer.valueOf(memberQuestionDO.getStoreCondition()));
+        partnerBaseInfoVO.setBankStatementsPic(qualificationsInfoDO.getBankStatementsPic());
-        partnerBaseInfoVO.setPaybackPeriod(Integer.valueOf(memberQuestionDO.getPaybackPeriod()));
+        partnerBaseInfoVO.setOldBrands(qualificationsInfoDO.getOldBrands());
-        partnerBaseInfoVO.setFollowsManagementStandard(memberQuestionDO.getFollowsManagementStandard());
+        partnerBaseInfoVO.setNewBrands(qualificationsInfoDO.getNewBrands());
-        partnerBaseInfoVO.setCanTraining(memberQuestionDO.getCanTraining());
+        partnerBaseInfoVO.setEnterpriseName(qualificationsInfoDO.getEnterpriseName());
-        partnerBaseInfoVO.setJoinType(memberQuestionDO.getJoinType());
+        partnerBaseInfoVO.setCompanyRegisteredAddress(qualificationsInfoDO.getCompanyRegisteredAddress());
+        partnerBaseInfoVO.setOfficeAddress(qualificationsInfoDO.getOfficeAddress());
+        partnerBaseInfoVO.setLegalName(qualificationsInfoDO.getLegalName());
+        partnerBaseInfoVO.setLegalIdCardNo(qualificationsInfoDO.getLegalIdCardNo());
+        partnerBaseInfoVO.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
+        partnerBaseInfoVO.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
+        partnerBaseInfoVO.setBusinessLeaderName(qualificationsInfoDO.getBusinessLeaderName());
+        partnerBaseInfoVO.setBusinessLeaderMobile(qualificationsInfoDO.getBusinessLeaderMobile());
+        partnerBaseInfoVO.setFinancialManagerName(qualificationsInfoDO.getFinancialManagerName());
+        partnerBaseInfoVO.setFinancialManagerMobile(qualificationsInfoDO.getFinancialManagerMobile());
+        partnerBaseInfoVO.setJoinType(qualificationsInfoDO.getJoinType());
         //LineInfoDO
         partnerBaseInfoVO.setId(lineInfoDO.getId());
         partnerBaseInfoVO.setPartnerId(lineInfoDO.getPartnerId());

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

@@ -0,0 +1,9 @@
+package com.cool.store.service;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/6/20 17:22
+ * @Version 1.0
+ */
+public interface DecorationDesignInfoService {
+}

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

@@ -0,0 +1,14 @@
+package com.cool.store.service.impl;
+
+import com.cool.store.service.DecorationDesignInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/6/20 17:22
+ * @Version 1.0
+ */
+@Service
+public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoService {
+
+}

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

@@ -5,6 +5,7 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.HyPartnerUserChannelDAO;
 import com.cool.store.dao.LineInfoDAO;
+import com.cool.store.dao.QualificationsInfoDAO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
 import com.cool.store.exception.ApiException;
@@ -77,6 +78,8 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
     private UserAuthMappingService userAuthMappingService;
     @Resource
     private ShopService shopService;
+    @Resource
+    QualificationsInfoDAO qualificationsInfoDAO;
 
 
     @Override
@@ -121,7 +124,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
             return null;
         }
         SigningBaseInfoResponse response = SigningBaseInfoResponse.from(signingBaseInfoDO);
-        MemberQuestionDO byLineId = joinIntentionMapper.getByLineId(lineId);
+        QualificationsInfoDO byLineId = qualificationsInfoDAO.getByLineId(lineId);
         response.setType(byLineId.getJoinType());
         if (Objects.nonNull(signingBaseInfoDO.getAuditId())) {
             LineAuditInfoDO lineAuditInfoDO = lineAuditInfoMapper.selectByPrimaryKey(signingBaseInfoDO.getAuditId());
@@ -256,9 +259,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
                 franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId()));
                 franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId()));
                 franchiseeDO.setOperator(user.getJobNumber());
-                MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfoDO.getId());
+                QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
                 //如果是企业加盟，需要传有效期和法人
-                if (Objects.nonNull(memberQuestionDO) && Constants.TWO_INTEGER.equals(memberQuestionDO.getJoinType())) {
+                if (Objects.nonNull(qualificationsInfoDO) && Constants.TWO_INTEGER.equals(qualificationsInfoDO.getJoinType())) {
                     SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfoDO.getId());
                     BusinessLicenseInfoVO businessLicenseInfo = aliyunService.getBusinessLicenseInfo(signingBaseInfoDO.getBusinessLicense());
                     franchiseeDO.setBusinessTerm(businessLicenseInfo.getValidPeriod());

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

@@ -2,6 +2,7 @@ package com.cool.store.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.dao.LineInfoDAO;
+import com.cool.store.dao.QualificationsInfoDAO;
 import com.cool.store.dao.RegionAreaConfigDao;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
@@ -33,6 +34,9 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     @Resource
     JoinIntentionMapper joinIntentionMapper;
 
+    @Resource
+    QualificationsInfoDAO  qualificationsInfoDAO;
+
     @Resource
     LineInfoDAO lineInfoDAO;
 
@@ -82,9 +86,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
             lineInfoParam.setBigRegionId(regionId);
         }
         lineInfoDAO.insertOrUpdate(lineInfoParam);
-        MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO();
+        QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();
-        memberQuestionDO.setLineId(lineInfoParam.getId());
+        qualificationsInfoDAO.insertOrUpdate(qualificationsInfoDO);
-        joinIntentionMapper.insertOrUpdate(memberQuestionDO);
 
         Map<String, String> requestMap = new HashMap<>();
         requestMap.put("partnerUsername", lineInfoParam.getUsername());
@@ -107,7 +110,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         //更新线索阶段
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
         //更新加盟问卷信息
-        joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
+        qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId());
         commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS);
         return Boolean.TRUE;
     }
@@ -118,14 +121,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         lineInfo.setUpdateUserId(userId);
         lineInfoDAO.updateLineInfo(lineInfo);
         //更新加盟问卷信息
-        joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
+        qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId());
         return Boolean.TRUE;
     }
 
     @Override
     public PartnerBaseInfoVO getByLineId(Long lineId) {
         LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId);
-        MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId);
+        QualificationsInfoDO result = qualificationsInfoDAO.getByLineId(lineId);
 
         if (Objects.isNull(byLineId)) {
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);

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

@@ -78,6 +78,8 @@ public class LineServiceImpl implements LineService {
     TrainingExperienceService trainingExperienceService;
     @Resource
     private RegionQrcodeConfigDao regionQrcodeConfigDao;
+    @Resource
+    QualificationsInfoDAO qualificationsInfoDAO;
 
 
     @Override
@@ -114,14 +116,14 @@ public class LineServiceImpl implements LineService {
             result.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason());
         }
 
-        MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfo.getId());
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId());
         Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo));
         Map<Long, String>  wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(Arrays.asList(lineInfo.getWantShopAreaId()));
         BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(lineInfo, userPortraitMap, wantShopAreaMap);
         result.setWantShopAreaName(baseInfoVO.getWantShopAreaName());
         result.setUserPortraitList(baseInfoVO.getUserPortraitList());
-        if (memberQuestionDO != null){
+        if (qualificationsInfoDO != null){
-            result.setJoinType(memberQuestionDO.getJoinType());
+            result.setJoinType(qualificationsInfoDO.getJoinType());
         }
         BeanUtil.copyProperties(lineInfo,result);
         return result;
@@ -317,30 +319,30 @@ public class LineServiceImpl implements LineService {
 
     @Override
     public IntendProcessTotalVO getIntendProcessTotal(Long lineId) {
-        MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineId);
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
-        if (memberQuestionDO==null){
+        if (qualificationsInfoDO==null){
             return null;
         }
         //总天数
         Integer totalDays = 10;
         IntendProcessTotalVO intendProcessTotalVO = new IntendProcessTotalVO();
         intendProcessTotalVO.setTotalDays(totalDays);
-        intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(memberQuestionDO.getCreateTime(),totalDays)));
+        intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(qualificationsInfoDO.getCreateTime(),totalDays)));
 
         List<Long> auditIds = new ArrayList<>();
-        if (memberQuestionDO.getAuditId()!=null){
+        if (qualificationsInfoDO.getAuditId()!=null){
-            auditIds.add(memberQuestionDO.getAuditId());
+            auditIds.add(qualificationsInfoDO.getAuditId());
         }
 
         List<LineInterviewDO> interviewList = lineInterviewDAO.getInterviewByLineId(lineId);
         auditIds.addAll(interviewList.stream().filter(x->x.getAuditId()!=null).map(LineInterviewDO::getAuditId).collect(Collectors.toList()));
         Map<Integer, Long> interviewDOMap = interviewList.stream().filter(x->x.getAuditId()!=null).collect(Collectors.toMap(k -> k.getInterviewType(), v -> v.getAuditId()));
-        interviewDOMap.put(10,memberQuestionDO.getAuditId());
+        interviewDOMap.put(10,qualificationsInfoDO.getAuditId());
         List<LineAuditInfoDO> lineAuditInfoList = lineAuditInfoDAO.getLineAuditInfoList(auditIds);
         Map<Long, Date> dateMap = lineAuditInfoList.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getCreateTime()));
 
         LinePayDO linePay = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,PayBusinessTypeEnum.INTENT_MONEY.getCode(),null);
-        SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(memberQuestionDO.getPartnerId(), lineId);
+        SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(qualificationsInfoDO.getPartnerId(), lineId);
 //        LeaseBaseInfoDO trainingExperience = trainingExperienceService.getTrainingExperience(lineId);
 
 
@@ -371,7 +373,7 @@ public class LineServiceImpl implements LineService {
 
         List<IntendProcessVO> list = new ArrayList<>();
         for (WorkflowSubStageEnum workflowSubStageEnum : WorkflowSubStageEnum.values()) {
-            IntendProcessVO intend = getIntend(memberQuestionDO.getCreateTime(), workflowSubStageEnum);
+            IntendProcessVO intend = getIntend(qualificationsInfoDO.getCreateTime(), workflowSubStageEnum);
             if (map.get(workflowSubStageEnum.getCode())!=null){
                 intend.setActualTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,map.get(workflowSubStageEnum.getCode())));
             }

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

@@ -252,14 +252,6 @@ public class PreparationServiceImpl implements PreparationService {
             decorationService.getDecorationModel(shopId, null);
             flushFlag = Boolean.TRUE;
         }
-        //施工阶段
-        Integer Status1100 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus();
-        Integer Status1110 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus();
-        Integer Construction = collect.get(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()).getShopSubStageStatus();
-        if (Status1110.equals(Construction) || Status1100.equals(Construction)) {
-            decorationService.getConstructionInfo(shopId);
-            flushFlag = Boolean.TRUE;
-        }
         return flushFlag;
     }
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.QualificationsInfoDAO;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
@@ -83,6 +84,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
 
     @Resource
     RedisUtilPool redisUtilPool;
+    @Resource
+    QualificationsInfoDAO qualificationsInfoDAO;
 
 
     @Override
@@ -377,7 +380,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         //线索信息
         LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
         //加盟问卷信息
-        MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(shopInfoDO.getLineId());
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(shopInfoDO.getLineId());
         //缴费信息
         FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectOne(FranchiseFeeDO.builder().shopId(shopId).build());
         //线索id
@@ -431,10 +434,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         if (Objects.nonNull(lineInfoDO)) {
             addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());
         }
-        if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(memberQuestionDO)) {
+        if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(qualificationsInfoDO)) {
-            if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())) {
+            if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(qualificationsInfoDO.getJoinType())) {
                 addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
-            } else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())) {
+            } else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(qualificationsInfoDO.getJoinType())) {
                 addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getBusinessLicenseCode());
             }
             addSignFranchiseResponse.setIdCardAddress(signingBaseInfoDO.getIdCardAddress());