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-06 17:32:56 +08:00
parent 2d0d896a58 5eebbc9cf3
commit 23f26ee0ed
13 changed files with 185 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/30 15:14
@@ -38,7 +40,7 @@ public class PartnerIntentInfoRequest {
private String moneySource;
@ApiModelProperty("资金证明")
private String moneyProve;
private List<String> moneyProve;
@ApiModelProperty("学历")
private String education;

3
coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java
View File

@@ -16,7 +16,4 @@ public class StageCountRequest extends PageInfoRequest {
@ApiModelProperty("类型 待处理-Pending 待跟进-follow")
private String type;
@ApiModelProperty("流程阶段")
private String workflowStage;
}

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

@@ -0,0 +1,67 @@
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 16:06
* @Version 1.0
*/
@Data
@ApiModel
public class BlackListVO {
@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("加盟商用户ID")
private String partnerUserId;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("加盟商用户手机号")
private String partnerUserPhone;
@ApiModelProperty("手机号归属地")
private String phoneAddress;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("操作时间")
private Date closeTime;
@ApiModelProperty("操作人ID")
private String closeUserId;
@ApiModelProperty("操作人名称")
private String closeUserName;
@ApiModelProperty("结束人员手机号")
private String closeUserPhone;
@ApiModelProperty("结束人员手机号归属地")
private String closeUserPhoneAddress;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java
View File

@@ -19,6 +19,9 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Author suzhuhong
@@ -46,7 +47,7 @@ public class PartnerIntentInfoVO {
private String moneySource;
@ApiModelProperty("资金证明")
private String moneyProve;
private List<String> moneyProve;
@ApiModelProperty("学历")
private String education;

5
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java
View File

@@ -19,6 +19,9 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝")
private Integer status;
@@ -28,7 +31,7 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("hy_partner_interview_arrangement.id")
private Long interviewArrangementId;
@ApiModelProperty("hy_partner_user_info.partner_id")
@ApiModelProperty("加盟商用户ID")
private String partnerId;
@ApiModelProperty("截止时间")

13
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java
View File

@@ -47,19 +47,6 @@ public class PartnerLineDetailVO {
@ApiModelProperty("用户画像")
private String userPortrait;
@ApiModelProperty("意向审核信息")
private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO;
@ApiModelProperty("预约面试、合格资格面试 信息")
private PartnerInterviewInfoVO partnerInterviewInfoVO;
@ApiModelProperty("邀请门店基本信息")
private InviteCodeDetailVO inviteCodeDetailVO;
@ApiModelProperty("跟进历史")
List<LineFollowHistoryVO> lineFollowHistoryVOList;

10
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerStageInfoVO.java → coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java
View File

@@ -13,7 +13,7 @@ import java.util.Date;
*/
@Data
@ApiModel
public class PartnerStageInfoVO {
public class PublicSeaLineListVo {
@ApiModelProperty("线索ID")
@@ -40,7 +40,7 @@ public class PartnerStageInfoVO {
@ApiModelProperty("手机号归属地")
private String phoneAddress;
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
@ApiModelProperty("面试开始时间")
private Date partnerInterviewStartTime;
@@ -60,10 +60,4 @@ public class PartnerStageInfoVO {
@ApiModelProperty("跟进次数")
private Integer followCount;
@ApiModelProperty("意向审核信息")
private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO;
@ApiModelProperty("预约面试、合格资格面试 信息")
private PartnerInterviewInfoVO partnerInterviewInfoVO;
}