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

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

@@ -1,15 +0,0 @@
-package com.cool.store.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class FraSourceDO {
-
-    @ApiModelProperty("key")
-    private String key;
-
-    @ApiModelProperty("text")
-    private String text;
-
-}

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

@@ -42,6 +42,9 @@ public class HyPartnerCertificationInfoDO implements Serializable {
     @ApiModelProperty("意向签约时间")
     private Date wantSignTime;
 
+    @ApiModelProperty("数据来源")
+    private String dataSource;
+
     @ApiModelProperty("加盟费")
     private String partnerFee;
 

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

@@ -1,9 +1,14 @@
 package com.cool.store.request;
 
+import com.cool.store.request.data.flow.IdName;
+import com.cool.store.request.data.flow.KeyText;
+import com.cool.store.request.data.flow.SkrRelshipProve;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: young.yu
  * @Date: 2023-06-14  14:18
@@ -30,23 +35,38 @@ public class CreateQualifyVerifyReq {
     @ApiModelProperty(value = "面试表现记录", required = true)
     private String summary;
 
-    @ApiModelProperty(value = "合作关系: 1总部下属; 2小区代直营; 3县代直营; 4县代下属; 5区代直营; 6区代下属", required = true)
-    private Integer partnership;
+    @ApiModelProperty(value = "加盟商类型", required = true)
+    private KeyText fraType;
+
+    @ApiModelProperty(value = "合作关系", required = true)
+    private KeyText partnership;
+
+    @ApiModelProperty(value = "意向人email", required = true)
+    private String intendedEmail;
+
+    @ApiModelProperty(value = "意向人联系地址", required = true)
+    private String intendedAddress;
+
+    @ApiModelProperty(value = "意向人身份证号", required = true)
+    private String intendedDCardNum;
 
     @ApiModelProperty(value = "意向签约时间", required = true, example = "YYYY-MM-DD")
     private String wantSignTime;
 
+    @ApiModelProperty(value = "数据来源", required = true)
+    private String dataSource;
+
     @ApiModelProperty(value = "加盟费", required = true)
-    private String partnerFee;
+    private Integer partnerFee;
 
     @ApiModelProperty(value = "保证金", required = true)
-    private String securityFund;
+    private Integer securityFund;
 
     @ApiModelProperty(value = "技术服务费", required = true)
-    private String technicalServiceFee;
+    private Integer technicalServiceFee;
 
     @ApiModelProperty(value = "意向金金额", required = true)
-    private String intentionMoney;
+    private Integer intentionMoney;
 
     @ApiModelProperty(value = "意向签约人姓名", required = true)
     private String intentionSignerUsername;
@@ -54,8 +74,8 @@ public class CreateQualifyVerifyReq {
     @ApiModelProperty(value = "意向签约人手机号", required = true)
     private String intentionSignerMobile;
 
-    @ApiModelProperty(value = "意向签约人学历: 1.初中及以下 2.高中 3.大专 4.本科 5.硕士及以上", required = true)
-    private String intentionEdu;
+    @ApiModelProperty(value = "意向签约人学历", required = true)
+    private KeyText intentionEdu;
 
     @ApiModelProperty(value = "实控人姓名", required = true)
     private String realControlUsername;
@@ -63,16 +83,34 @@ public class CreateQualifyVerifyReq {
     @ApiModelProperty(value = "实控人身份证", required = true)
     private String realControlIdcard;
 
-    @ApiModelProperty(value = "实控人与签约人关系: 1.本人 2.配偶 3.二代直系亲属 4.雇佣 5.其他", required = true)
-    private String signerRealControlRelation;
+    @ApiModelProperty(value = "实控人与签约人关系", required = true)
+    private KeyText signerRealControlRelation;
 
     @ApiModelProperty(value = "其他实控人与签约人关系")
     private String signerOtherRealControlRelation;
 
-    @ApiModelProperty(value = "实控人与签约人关系证明(文件上传地址，多个以英文逗号隔开)")
+    @ApiModelProperty(value = "实控人与签约人关系证明(文件上传地址，多个以英文逗号隔开)", required = true)
     private String signerRealControlRelationCert;
 
+    @ApiModelProperty(value = "省", required = true)
+    private IdName linkProv;
 
+    @ApiModelProperty(value = "省编码", required = true)
+    private String provID;
 
+    @ApiModelProperty(value = "市", required = true)
+    private IdName linkCity;
+
+    @ApiModelProperty(value = "市编码", required = true)
+    private String cityID;
+
+    @ApiModelProperty(value = "所属大区", required = true)
+    private IdName linkOrgRegion;
+
+    @ApiModelProperty(value = "业务战区", required = true)
+    private IdName linkbuArea;
+
+    @ApiModelProperty(value = "实控人手机号", required = true)
+    private String skrPhone;
 
 }

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

@@ -1,9 +1,13 @@
 package com.cool.store.request;
 
-import com.cool.store.entity.FraSourceDO;
+import com.cool.store.request.data.flow.IdName;
+import com.cool.store.request.data.flow.KeyText;
+import com.cool.store.request.data.flow.SkrRelshipProve;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: young.yu
  * @Date: 2023-06-14  15:06
@@ -14,14 +18,15 @@ public class RpcCreateQualifyVerifyReq {
 
     @lombok.Data
     public class Data {
+
         @ApiModelProperty(value = "意向签约时间", required = true)
         private String intendedSignDate;
 
-        @ApiModelProperty(value = "请求来源", required = true)
-        private FraSourceDO fraSource;
+        @ApiModelProperty(value = "请求来源", required = false)
+        private KeyText fraSource;
 
         @ApiModelProperty(value = "保证金（元）", required = true, example = "5000")
-        private int amtDeposit;
+        private Integer amtDeposit;
 
         @ApiModelProperty(value = "授权码", required = true)
         private String authCode;
@@ -29,9 +34,72 @@ public class RpcCreateQualifyVerifyReq {
         @ApiModelProperty(value = "意向签约人", required = true)
         private String intendedSigner;
 
-        @ApiModelProperty(value = "手机号", required = true)
+        @ApiModelProperty(value = "意向签约人手机号", required = true)
         private String intendedSignerTel;
 
+        @ApiModelProperty(value = "合作关系", required = true)
+        private KeyText partnership;
+
+        @ApiModelProperty(value = "所属大区", required = true)
+        private IdName linkOrgRegion;
+
+        @ApiModelProperty(value = "省", required = true)
+        private IdName linkProv;
+
+        @ApiModelProperty(value = "省编码", required = true)
+        private String provID;
+
+        @ApiModelProperty(value = "市", required = true)
+        private IdName linkCity;
+
+        @ApiModelProperty(value = "市编码", required = true)
+        private String cityID;
+
+        @ApiModelProperty(value = "加盟商类型", required = true)
+        private KeyText fraType;
+
+        @ApiModelProperty(value = "意向人email", required = true)
+        private String intendedEmail;
+
+        @ApiModelProperty(value = "意向人联系地址", required = true)
+        private String intendedAddress;
+
+        @ApiModelProperty(value = "意向人身份证号", required = true)
+        private String intendedDCardNum;
+
+        @ApiModelProperty(value = "签约人学历", required = true)
+        private KeyText signerEdu;
+
+        @ApiModelProperty(value = "实控人", required = true)
+        private String skrName;
+
+        @ApiModelProperty(value = "实控人身份证号", required = true)
+        private String skrIDCard;
+
+        @ApiModelProperty(value = "实控人与签约人关系", required = true)
+        private KeyText skrRelship;
+
+        @ApiModelProperty("实控人与签约人关系证明文件")
+        private List<SkrRelshipProve> skrRelshipProve;
+
+        @ApiModelProperty("其他实控人与签约人关系")
+        private String skrRelshipOther;
+
+        @ApiModelProperty(value = "加盟费（元）", required = true)
+        private Integer amtJoin;
+
+        @ApiModelProperty(value = "技术服务费", required = true)
+        private Integer amtTechSer;
+
+        @ApiModelProperty(value = "意向金金额", required = true)
+        private Integer amtIntended;
+
+        @ApiModelProperty(value = "业务战区", required = true)
+        private IdName linkbuArea;
+
+        @ApiModelProperty(value = "实控人手机号", required = true)
+        private String skrPhone;
+
     }
 
     @ApiModelProperty(value = "数据体", required = true)

coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/IdName.java

@@ -0,0 +1,25 @@
+package com.cool.store.request.data.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 800 发起审批入参用
+ * 对应 800 系统中需要入参格式为
+ *  "linkProv": {
+ *      "id": "1645610037222441004",
+ *      "name": "广东省"
+ *  },
+ * 的地方
+ * 暂时使用，后期应该使用各字段对应的枚举类
+ */
+@Data
+public class IdName {
+
+    @ApiModelProperty(value = "id", required = true)
+    private String id;
+
+    @ApiModelProperty(value = "name", required = true)
+    private String name;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/KeyText.java

@@ -0,0 +1,25 @@
+package com.cool.store.request.data.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 800 发起审批入参用
+ * 对应 800 系统中需要入参格式为
+ *  "fraType": {
+ *      "key": "LEGAL",
+ *      "text": "法人"
+ *  },
+ * 的地方
+ * 暂时使用，后期应该使用各字段对应的枚举类
+ */
+@Data
+public class KeyText {
+
+    @ApiModelProperty(value = "id", required = true)
+    private String key;
+
+    @ApiModelProperty(value = "text", required = true)
+    private String text;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/SkrRelshipProve.java

@@ -0,0 +1,27 @@
+package com.cool.store.request.data.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实控人与签约人关系证明文件
+ */
+@Data
+public class SkrRelshipProve {
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("文件名")
+    private String name;
+
+    @ApiModelProperty("大小")
+    private String size;
+
+    @ApiModelProperty("文件后缀")
+    private String suffix;
+
+    @ApiModelProperty("文件类型")
+    private String type;
+
+}

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

@@ -19,4 +19,7 @@ public class ApplyBaseInfoVO {
     @ApiModelProperty("所选省内是否含有开放城市")
     private Boolean provinceHasOpenArea;
 
+    @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
+    private Integer lineStatus;
+
 }