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:
pserimal
2023-06-19 16:54:17 +08:00
parent f5c58632e3 3b8a34e766
commit 78313c9f47
8 changed files with 246 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}

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;
}

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;