Merge #26 into master from cc_20260105_partner

feat:测试

* cc_20260105_partner: (8 commits squashed)

  - feat:加盟商意向书字段调整

  - feat:意向审核

  - feat:加盟商意向申请

  - feat:新增其他备注

  - feat:返回信息缺失

  - feat:资质阶段审核完成才回成为加盟商

  - feat:大区查询阶段状态是6

  - feat:测试

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26

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

@@ -215,4 +215,23 @@ public class QualificationsInfoDO {
     @Column(name = "unified_social_credit_code")
     private String unifiedSocialCreditCode;
 
+    @Column(name = "electronic_email")
+    private String electronicEmail;
+
+    @Column(name = "info_source")
+    private String infoSource;
+
+    @Column(name = "capital_strength")
+    private Integer capitalStrength;
+
+    @Column(name = "has_retail_experience")
+    private Integer hasRetailExperience;
+
+    @Column(name = "willing_station_duration")
+    private Integer willingStationDuration;
+
+    @Column(name = "other_remark")
+    private String otherRemark;
+
+
 }

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

@@ -106,6 +106,25 @@ public class JoinIntentionRequest {
     @ApiModelProperty("督导")
     private String supervisor;
 
+    @ApiModelProperty("电子邮件")
+    private String electronicEmail;
+
+    @ApiModelProperty("信息来源")
+    private String infoSource;
+
+    @ApiModelProperty("信息来源选择其他时 可输入")
+    private String otherRemark;
+
+    @ApiModelProperty("资金实力")
+    private Integer capitalStrength;
+
+    @ApiModelProperty("是否有从事零售业经验")
+    private Integer hasRetailExperience;
+
+    @ApiModelProperty("是否愿意驻点大于等于90小时")
+    private Integer willingStationDuration;
+    
+
     public LineInfoDO toLineInfoDO() {
         LineInfoDO lineInfoDO = new LineInfoDO();
         lineInfoDO.setPartnerId(this.partnerId);
@@ -158,6 +177,12 @@ public class JoinIntentionRequest {
         qualificationsInfoDO.setFinancialManagerName(this.financialManagerName);
         qualificationsInfoDO.setFinancialManagerMobile(this.financialManagerMobile);
         qualificationsInfoDO.setBusinessLicense(this.businessLicense);
+        qualificationsInfoDO.setElectronicEmail(this.electronicEmail);
+        qualificationsInfoDO.setInfoSource(this.infoSource);
+        qualificationsInfoDO.setCapitalStrength(this.capitalStrength);
+        qualificationsInfoDO.setHasRetailExperience(this.hasRetailExperience);
+        qualificationsInfoDO.setWillingStationDuration(this.willingStationDuration);
+        qualificationsInfoDO.setOtherRemark(this.otherRemark);
         return qualificationsInfoDO;
     }
 }

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

@@ -6,6 +6,7 @@ import com.cool.store.entity.QualificationsInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.Date;
 import java.util.Objects;
 
@@ -111,6 +112,24 @@ public class PartnerBaseInfoVO {
      @ApiModelProperty("督导手机号")
      private String supervisorMobile;
 
+    @Column(name = "电子邮件")
+    private String electronicEmail;
+
+    @Column(name = "信息来源 字典")
+    private String infoSource;
+
+    @Column(name = "资金实力（万元）")
+    private Integer capitalStrength;
+
+    @Column(name = "是否有从事零售业的经营经验：0-否，1-是")
+    private Integer hasRetailExperience;
+
+    @Column(name = "是否愿意驻点时长≥90小时：0-否，1-是")
+    private Integer willingStationDuration;
+
+    @Column(name = "其他备注")
+    private String otherRemark;
+
 
     public static PartnerBaseInfoVO from(QualificationsInfoDO qualificationsInfoDO, LineInfoDO lineInfoDO) {
         if (Objects.isNull(qualificationsInfoDO) && Objects.isNull(lineInfoDO)) {
@@ -156,6 +175,13 @@ public class PartnerBaseInfoVO {
         partnerBaseInfoVO.setSex(Integer.valueOf(lineInfoDO.getSex()));
         partnerBaseInfoVO.setAreaCode(String.valueOf(lineInfoDO.getWantShopAreaId()));
         partnerBaseInfoVO.setBigRegionId(lineInfoDO.getBigRegionId());
+
+        partnerBaseInfoVO.setElectronicEmail(qualificationsInfoDO.getElectronicEmail());
+        partnerBaseInfoVO.setInfoSource(qualificationsInfoDO.getInfoSource());
+        partnerBaseInfoVO.setCapitalStrength(qualificationsInfoDO.getCapitalStrength());
+        partnerBaseInfoVO.setHasRetailExperience(qualificationsInfoDO.getHasRetailExperience());
+        partnerBaseInfoVO.setWillingStationDuration(qualificationsInfoDO.getWillingStationDuration());
+        partnerBaseInfoVO.setOtherRemark(qualificationsInfoDO.getOtherRemark());
         return partnerBaseInfoVO;
     }