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-19 19:54:53 +08:00
parent 3c8b298706 0ec142170e
commit 1f982674a4
41 changed files with 916 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,49 @@
package com.cool.store.dto.mdm;
import lombok.Data;
@Data
public class CallbackDto {
//
// private Owner owner;
//
// private long modifiedTime;
//
// private Creator creator;
//
// private CreatorDepartment creatorDepartment;
//
// private String authCode;
//
// private Modifier modifier;
//
// private int amtDeposit;
//
// private FraSource fraSource;
//
// private String intendedSignerTel;
//
// private String sequenceNo;
//
// private String sequenceStatus;
//
// private String instanceId;
//
// private OwnerDepartment ownerDepartment;
//
// private SelfObject selfObject;
//
// private String name;
//
// private long createdTime;
//
// private String id;
//
// private long intendedSignDate;
//
// private String intendedSigner;
//
// private String systemsource;
}

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

@@ -0,0 +1,72 @@
package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/19 15:30
* @Version 1.0
*/
@Data
public class PrivateSeaLineDTO {
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("加盟商用户ID")
private String partnerId;
@ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
private String workflowStage;
@ApiModelProperty("流程子状态")
private String workflowStatus;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@ApiModelProperty("加盟商用户手机号")
private String partnerUserPhone;
@ApiModelProperty("截止时间")
private Date deadline;
@ApiModelProperty("招商经理")
private String investmentManager;
@ApiModelProperty("招商经理名称")
private String investmentManagerName;
@ApiModelProperty("开发经理")
private String developmentManager;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("门店编码")
private String storeCode;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@ApiModelProperty("推荐加盟商ID")
private String recommendPartnerId;
@ApiModelProperty("推荐加盟商名称")
private String recommendPartnerName;
}

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

@@ -33,6 +33,12 @@ public class HyPartnerCertificationInfoDO implements Serializable {
@ApiModelProperty("合作关系:1总部下属;2小区代直营;3县代直营;4县代下属;5区代直营;6区代下属")
private String partnership;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("意向合同编号")
private String intentionContractNo;
@ApiModelProperty("意向签约时间")
private Date wantSignTime;

14
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java
View File

@@ -54,11 +54,17 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("授权码")
private String authCode;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("通过函编码")
private String passCode;
@ApiModelProperty("函文件url")
private String passFileUrl;
@ApiModelProperty("函文件Pdf url")
private String passPdfUrl;
@ApiModelProperty("函文件image url")
private String passImageUrl;
@ApiModelProperty("审核通过时间")
private Date passTime;
@ApiModelProperty("有效期")
private Date expiryDate;

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

@@ -15,12 +15,18 @@ public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "线索id", required = true)
private String lineId;
@ApiModelProperty(value = "会议安排id", required = true)
private String interviewPlanId;
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty(value = "加盟商id", required = true)
private String partnerId;
@ApiModelProperty(value = "开发主管用户id", required = true)
private String devtDirectorId;
@ApiModelProperty(value = "面试表现记录", required = true)
private String summary;

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

@@ -12,9 +12,9 @@ import lombok.Data;
@Data
@ApiModel
public class GetFreeBusyListReq {
@ApiModelProperty("开始时间")
@ApiModelProperty(value = "开始时间", required = true)
private String startDate;
@ApiModelProperty("结束时间")
@ApiModelProperty(value = "结束时间",required = true)
private String endDate;
@ApiModelProperty("加盟商用户ID")
private String partnerId;

18
coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.request;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,16 +14,17 @@ import java.util.Date;
*/
@Data
@ApiModel
public class PrivateSeaLineListRequest {
public class PrivateSeaLineListRequest extends PageInfoRequest {
@ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】 搜索关键字")
private String keyword;
@ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】")
private String keyWord;
@ApiModelProperty("name:表示用户姓名/招商经理姓名 mobile 用户手机号/招商经理手机号")
private String keywordType;
@ApiModelProperty("一级下拉列表选择当前意向阶段")
private String workflowStage;
@ApiModelProperty("二级下拉列表可选项为当前一级下拉列表选中的意向阶段的状态")
private String workflowStatus;
@@ -39,11 +41,9 @@ public class PrivateSeaLineListRequest {
private Integer acceptAdjustType;
@ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】")
private String keyInfo;
private String storeKeyword;
@ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】")
private String storeKeywordType;
}

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

@@ -0,0 +1,23 @@
package com.cool.store.request;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@Api("资质审核回调入参")
public class QualificationCallbackReq {
@ApiModelProperty(value = "审核流程id", required = true)
private String instanceId;
@ApiModelProperty(value = "流程状态 已完成：FINISHED, 已作废：CANCELED", required = true)
private String sequenceStatus;
@ApiModelProperty(value = "意向签约人", required = true)
private String intendedSigner;
@ApiModelProperty(value = "审核通过时间", required = true)
private long modifiedTime;
}

14
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
View File

@@ -17,9 +17,9 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("线索ID")
private Long id;
private Long lineId;
@ApiModelProperty("hy_partner_user_info.partner_id")
@ApiModelProperty("加盟商用户ID")
private String partnerId;
@ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
@@ -28,9 +28,6 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("流程子状态")
private String workflowStatus;
@ApiModelProperty("加盟商用户ID")
private String partnerUserId;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;
@@ -43,12 +40,15 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("招商经理")
private String investmentManager;
@ApiModelProperty("开发主管")
private String developmentDirector;
@ApiModelProperty("招商经理")
private String investmentManagerName;
@ApiModelProperty("开发经理")
private String developmentManager;
@ApiModelProperty("开发经理")
private String developmentManagerName;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

10
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.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: young.yu
* @Date: 2023-06-08 16:26
@@ -22,6 +24,9 @@ public class InterviewVO {
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("意向合同编号")
private String intentionContractNo;
@ApiModelProperty("审核通过时间")
private String passTime;
@@ -76,7 +81,10 @@ public class InterviewVO {
@ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true)
private Integer status;
@ApiModelProperty(value = "面试过程信息", required = false)
@ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
private List<String> vedioList;
@ApiModelProperty(value = "面试过程信息未解析String", required = false)
private String processInfo;
@ApiModelProperty("授权码")