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-14 10:45:04 +08:00
parent 2ed2296a82 e87356fd87
commit b9cab477e9
75 changed files with 1736 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java
View File

@@ -18,4 +18,10 @@ public class ContentQueryListDto extends PageBasicInfo {
@ApiModelProperty("类型，默认选中全部时不传值")
private String contentType;
@ApiModelProperty("筛选开始时间")
private String startTime;
@ApiModelProperty("筛选结束时间")
private String endTime;
}

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

@@ -0,0 +1,18 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class EnterInterviewDto {
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty(value = "用户id", required = true)
private String userId;
@ApiModelProperty(value = "1.面试官2.加盟商3.其他", required = true)
private Integer userType;
}

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

@@ -13,6 +13,9 @@ public class PartnerLineInfoAndBaseInfoDTO {
@ApiModelProperty("线索ID")
private Long id;
@ApiModelProperty("加盟申请基本信息 添加tags使用该ID")
private Long partnerBaseInfoId;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;

4
coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java
View File

@@ -40,10 +40,10 @@ public class HyContentInfoDO implements Serializable {
private Integer deleted;
@ApiModelProperty("创建时间")
private Date createTime;
private String createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
private String updateTime;
@ApiModelProperty("新建人ID")
private String createUserId;

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

@@ -15,8 +15,8 @@ import java.util.List;
@ApiModel
public class AddTagsRequest {
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("加盟申请基本信息ID")
private Long partnerBaseInfoId;
@ApiModelProperty("标签列表")
private List<String> Tags;
}

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

@@ -13,8 +13,8 @@ import lombok.Data;
@ApiModel
public class BaseUserInfoRequest {
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("partnerId")
private String partnerId;
@ApiModelProperty("手机号")
private String mobile;
@@ -25,11 +25,11 @@ public class BaseUserInfoRequest {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
@ApiModelProperty("意向开店区域ID")
private String wantShopArea;
@ApiModelProperty("意向开店区域ID")
private Long wantShopAreaId;
@ApiModelProperty("意向开店区域Name")
private Long wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;

4
coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.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/31 11:01
@@ -21,7 +23,7 @@ public class CloseFollowRequest {
@ApiModelProperty("真实拒绝原因")
private String rejectRealReason;
@ApiModelProperty("证明文件与凭证")
private String certifyFile;
private List<String> certifyFile;
@ApiModelProperty("通过原因")
private String passReason;
@ApiModelProperty("通过-pass 拒绝-reject")

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

@@ -0,0 +1,20 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-09 15:41
* @Description:
*/
@Data
@ApiModel
public class EntrustOthersReq {
@ApiModelProperty("会议编号")
private String interviewId;
@ApiModelProperty("新面试官编号")
private String newInterviewerId;
}

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

@@ -0,0 +1,17 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-12 17:43
* @Description:
*/
@Data
@ApiModel
public class FinishInterviewReq {
@ApiModelProperty("会议编号")
private String interviewId;
}

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

@@ -0,0 +1,32 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-06 15:50
* @Description:
*/
@Data
@ApiModel
public class GetInterviewListReq extends PageBasicInfo {
@ApiModelProperty("加盟商姓名")
private String partnerName;
@ApiModelProperty("加盟商手机号")
private String partnerMobile;
@ApiModelProperty("房间号")
private String roomId;
@ApiModelProperty("面试官姓名")
private String interviewerName;
@ApiModelProperty("面试官手机号")
private String interviewerMobile;
@ApiModelProperty("房间状态:0待开放;1已开放; 2已关闭")
private Integer roomStatus;
@ApiModelProperty("开始时间")
private String startTime;
@ApiModelProperty("结束时间")
private String endTime;
}

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

@@ -0,0 +1,21 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-12 17:43
* @Description:
*/
@Data
@ApiModel
public class ModifyInterviewTimeReq {
@ApiModelProperty("会议编号")
private String interviewId;
@ApiModelProperty("新预约开始时间")
private String newStartBookingTime;
@ApiModelProperty("新预约结束时间")
private String newEndBookingTime;
}

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

@@ -0,0 +1,17 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-09 15:41
* @Description:
*/
@Data
@ApiModel
public class QueryByInterviewIdReq {
@ApiModelProperty("会议编号")
private String interviewId;
}

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

@@ -0,0 +1,48 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class HyContentInfoVO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("内容标题")
private String contentTitle;
@ApiModelProperty("栏目CODE")
private String subject;
@ApiModelProperty("类型 image-图文 video-视频")
private String contentType;
@ApiModelProperty("封面URL")
private String cover;
@ApiModelProperty("状态 0-启用 1-禁用")
private Integer status;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("更新时间")
private String updateTime;
@ApiModelProperty("新建人ID")
private String createUserId;
@ApiModelProperty("更新人ID")
private String updateUserId;
@ApiModelProperty("更新人姓名")
private String updateUserName;
@ApiModelProperty("更新人电话")
private String updateUserPhone;
@ApiModelProperty("图文内容或者视频文件URL")
private String content;
}

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

@@ -0,0 +1,15 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PartnerEnterInterviewVO {
@ApiModelProperty("userSig 进入会议需要的用户签名")
private String userSign;
@ApiModelProperty("面试官id")
private String interviewerId;
}

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

@@ -18,6 +18,8 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("线索ID")
private Long id;
private Long partnerBaseInfoId;
@ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
private String workflowStage;

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

@@ -0,0 +1,27 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PartnerPassLetterDetailVO {
@ApiModelProperty("加盟商姓名")
private String partnerName;
@ApiModelProperty("编码")
private String passCode;
@ApiModelProperty("审核城市")
private String verifyCity;
@ApiModelProperty("函文件URL")
private String passFileUrl;
@ApiModelProperty("生成日期：YYYY-MM-DD")
private String createTime;
@ApiModelProperty("有效期截至")
private String expiryDate;
}

145
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java Normal file
View File

@@ -0,0 +1,145 @@
package com.cool.store.vo.interview;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Author: young.yu
* @Date: 2023-06-08 16:26
* @Description:
*/
@ApiModel(description = "面试信息")
public class InterviewVO {
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty(value = "加盟商用户编号")
private String partnerId;
@ApiModelProperty(value = "被面试人姓名", required = true)
private String partnerName;
@ApiModelProperty(value = "被面试人手机号", required = true)
private String partnerMobile;
@ApiModelProperty(value = "房间号", required = true)
private String roomId;
@ApiModelProperty(value = "会议计划开始时间", required = true, example = "2023-06-03 10:00")
private String startTime;
@ApiModelProperty(value = "面试官人员编号")
private String interviewerId;
@ApiModelProperty(value = "面试官姓名", required = true)
private String interviewerName;
@ApiModelProperty(value = "面试官手机号", required = true)
private String interviewerMobile;
@ApiModelProperty(value = "房间状态(0待开放;1已开放;2已关闭)", required = true)
private String roomStatus;
@ApiModelProperty(value = "会议结束时间", required = true, example = "2023-06-03 12:00")
private String endTime;
@ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true)
private Integer status;
public String getPartnerId() {
return partnerId;
}
public void setPartnerId(String partnerId) {
this.partnerId = partnerId;
}
public String getInterviewerId() {
return interviewerId;
}
public void setInterviewerId(String interviewerId) {
this.interviewerId = interviewerId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getInterviewId() {
return interviewId;
}
public void setInterviewId(String interviewId) {
this.interviewId = interviewId;
}
public String getPartnerName() {
return partnerName;
}
public void setPartnerName(String partnerName) {
this.partnerName = partnerName;
}
public String getPartnerMobile() {
return partnerMobile;
}
public void setPartnerMobile(String partnerMobile) {
this.partnerMobile = partnerMobile;
}
public String getRoomId() {
return roomId;
}
public void setRoomId(String roomId) {
this.roomId = roomId;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getInterviewerName() {
return interviewerName;
}
public void setInterviewerName(String interviewerName) {
this.interviewerName = interviewerName;
}
public String getInterviewerMobile() {
return interviewerMobile;
}
public void setInterviewerMobile(String interviewerMobile) {
this.interviewerMobile = interviewerMobile;
}
public String getRoomStatus() {
return roomStatus;
}
public void setRoomStatus(String roomStatus) {
this.roomStatus = roomStatus;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}