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-13 09:50:18 +08:00
parent 12cb59dca8 5a6cd73113
commit 66cab97c70
38 changed files with 1938 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java Normal file
View File

@@ -0,0 +1,49 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/9 15:37
* @Version 1.0
*/
@Data
public class PartnerIntentApplyInfoDTO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("截止时间")
private Date deadline;
@ApiModelProperty("阶段提交时间")
private Date partnerSubmitTime;
@ApiModelProperty("所属阶段")
private String workflowStage;
@ApiModelProperty("子流程状态")
private String workflowStatus;
}

64
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java Normal file
View File

@@ -0,0 +1,64 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/9 19:40
* @Version 1.0
*/
@Data
public class PartnerInterviewInfoDTO {
@ApiModelProperty("hy_partner_interview.id")
private Long interviewId;
@ApiModelProperty("hy_partner_interview_plan.id")
private Long id;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝")
private Integer status;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("加盟商用户ID")
private String partnerId;
@ApiModelProperty("截止时间")
private Date deadline;
@ApiModelProperty("审批发起时间")
private Date approveTime;
@ApiModelProperty("意向合同号")
private String authCode;
@ApiModelProperty("面试开始时间")
private Date startTime;
@ApiModelProperty("面试结束时间")
private Date endTime;
@ApiModelProperty("面试官ID")
private String interviewer;
@ApiModelProperty("面试官名称")
private String interviewerName;
@ApiModelProperty("预约时间")
private Date createTime;
@ApiModelProperty("房间号")
private String roomId;
@ApiModelProperty("过程信息")
private String processInfo;
}

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

@@ -0,0 +1,44 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/12 16:05
* @Version 1.0
*/
@Data
public class PartnerLineInfoAndBaseInfoDTO {
@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 String investmentManager;
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
}

17
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package com.cool.store.dto.partner;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/8 16:38
* @Version 1.0
*/
@Data
public class SpecialDateRangeInterviewCountDTO {
private Integer currentDayInterviewCount;
private Integer lastSevenDayInterviewCount;
}

38
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.dto.partner;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/9 10:16
* @Version 1.0
*/
@Data
public class StageCountDTO {
/**
* 意向申请待处理或者待跟进数量
*/
private Integer intentApplyApproveCount;
/**
* 预约面试阶段 待跟进数量
*/
private Integer reservationInterviewCount;
/**
* 合格资格面试 待处理或者待跟进数量
*/
private Integer qualifiedInterviewCount;
public StageCountDTO(Integer intentApplyApproveCount, Integer reservationInterviewCount, Integer qualifiedInterviewCount) {
this.intentApplyApproveCount = intentApplyApproveCount;
this.reservationInterviewCount = reservationInterviewCount;
this.qualifiedInterviewCount = qualifiedInterviewCount;
}
public StageCountDTO(Integer intentApplyApproveCount, Integer qualifiedInterviewCount) {
this.intentApplyApproveCount = intentApplyApproveCount;
this.qualifiedInterviewCount = qualifiedInterviewCount;
}
public StageCountDTO() {
}
}

21
coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/30 21:22
* @Version 1.0
*/
@Data
@ApiModel
public class TransferInvestmentManagerRequest {
private Long lineId;
private String userId;
}

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

@@ -0,0 +1,27 @@
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/8 16:12
* @Version 1.0
*/
@Data
@ApiModel
public class InterviewDetailInfoVO {
@ApiModelProperty("面试者ID")
private String userId;
@ApiModelProperty("面试者名称")
private String userName;
@ApiModelProperty("面试者手机号")
private String userPhone;
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("面试开始时间")
private Date startTime;
}

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

@@ -0,0 +1,20 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/6/8 14:39
* @Version 1.0
*/
@Data
@ApiModel
public class InterviewPlanVO {
private Boolean hasInterview;
private Boolean hasAdventLine;
}

13
coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.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
@@ -19,15 +20,7 @@ public class InterviewScheduleInfoVO {
private Integer currentDayInterviewCount;
@ApiModelProperty("当前日期后七天面试数量")
private Integer lastSevenDayInterviewCount;
@ApiModelProperty("面试者ID")
private String userId;
@ApiModelProperty("面试者名称")
private String userName;
@ApiModelProperty("面试者手机号")
private String userPhone;
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("面试开始时间")
private Date startTime;
@ApiModelProperty("面试日程列表")
private List<InterviewDetailInfoVO> interviewDetailInfoVOS;
}

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

@@ -6,6 +6,7 @@ import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/5/30 20:11
@@ -22,6 +23,9 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("加盟商手机号码")
private String partnerUserPhone;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@@ -34,6 +38,9 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@@ -43,7 +50,4 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("阶段提交时间")
private Date partnerSubmitTime;
}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/5/30 20:28
@@ -14,7 +16,7 @@ import lombok.Data;
public class PartnerInterviewInfoVO {
@ApiModelProperty("会议id")
private String interviewId;
private Long interviewId;
@ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝")
private Integer status;
@@ -40,4 +42,9 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("面试官名称")
private String interviewerName;
@ApiModelProperty("预约时间")
private String createTime;
@ApiModelProperty("过程信息")
private String processInfo;
}

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

@@ -13,14 +13,11 @@ import java.util.List;
*/
@Data
@ApiModel
public class PartnerLineDetailVO {
public class PartnerLineInfoAndBaseInfoVO {
@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;
@@ -42,13 +39,11 @@ public class PartnerLineDetailVO {
@ApiModelProperty("招商经理")
private String investmentManager;
@ApiModelProperty("招商经理")
private String investmentManagerName;
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
}