suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-05 11:34:52 +08:00
parent 0576ed223a 9d0b924404
commit 04e7ebea85
10 changed files with 267 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java
View File

@@ -34,5 +34,7 @@ public class BaseUserInfoRequest {
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("邀请码")
private String inviteCode;
}

5
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java
View File

@@ -52,6 +52,11 @@ public class PartnerBaseInfoRequest {
private String liveAddress;
@ApiModelProperty("提交标识 提交-true 暂存-false")
private Boolean submitFlag;
}

14
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java → coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java
View File

@@ -13,14 +13,18 @@ import java.util.List;
*/
@ApiModel
@Data
public class PartnerSummaryInfoRequest {
public class PartnerClerkInfoRequest {
@ApiModelProperty("线索表ID")
private Long partnerLineId;
@ApiModelProperty("加盟商C端用户表ID partnerId ")
private String partnerId;
@ApiModelProperty("加盟商基本信息对象")
private PartnerBaseInfoRequest partnerBaseInfoRequest;
@ApiModelProperty("加盟商店员信息列表")
private List<PartnerClerkRequest> partnerClerkRequestList;
@ApiModelProperty("加盟商意向信息/行业认知")
private PartnerIntentInfoRequest partnerIntentInfoRequest;
@ApiModelProperty("提交标识 提交-true 暂存-false")
private Boolean submitFlag;
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java
View File

@@ -17,12 +17,6 @@ public class PartnerClerkRequest {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("伙伴姓名")
private String username;

9
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
View File

@@ -16,12 +16,6 @@ public class PartnerIntentInfoRequest {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("常驻区域")
private String liveArea;
@@ -76,4 +70,7 @@ public class PartnerIntentInfoRequest {
@ApiModelProperty("劣势")
private String weakness;
@ApiModelProperty("提交标识 提交-true 暂存-false")
private Boolean submitFlag;
}

36
coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/6/2 10:55
* @Version 1.0
*/
@Data
@ApiModel
public class OpenAreaTreeVO {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("parent.id")
private Long parentId;
@ApiModelProperty("区域名称")
private String areaName;
@ApiModelProperty("区域路径")
private String areaPath;
@ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和")
private String areaStatus;
@ApiModelProperty("子区域")
List<OpenAreaTreeVO> childNode;
}

44
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/2 14:29
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerLineBaseInfoVO {
@ApiModelProperty("线索ID")
private Long id;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
private String workflowStage;
@ApiModelProperty("流程子状态")
private String workflowStatus;
@ApiModelProperty("当前阶段截止时间")
private Date deadline;
@ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天")
private Date closeTime;
@ApiModelProperty("冷静期首次登录标识 true-是首次")
private Boolean coolDownFirstLoginFlag;
@ApiModelProperty("拒绝原因 冷静期提示文案中用到 全部流程中用到(拒绝的时候暂时拒绝原因)")
private String cause;
}

40
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/2 10:29
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerUserInfoVO {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("申请人姓名")
private String username;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域ID")
private Long wantShopAreaId;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("邀请码")
private String inviteCode;
}