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 
# Conflicts:
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
This commit is contained in:
zhangchenbiao
2023-05-31 16:48:35 +08:00
parent 5070f52076 4ffa65d58d
commit c43388af90
13 changed files with 462 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,27 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:58
* @Version 1.0
*/
@Data
@ApiModel
public class AdvancedSettingRequest {
private Long id;
private String partnerUrl;
private String tencentVideoAccount;
private String tencentVideoKey;
private List<String> roleIdList;
}

5
coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java
View File

@@ -13,6 +13,7 @@ import lombok.Data;
@ApiModel
public class CloseFollowRequest {
@ApiModelProperty("线索ID")
private Long lineId;
@ApiModelProperty("公开拒绝原因")
@@ -21,5 +22,9 @@ public class CloseFollowRequest {
private String rejectRealReason;
@ApiModelProperty("证明文件与凭证")
private String certifyFile;
@ApiModelProperty("通过原因")
private String passReason;
@ApiModelProperty("通过-pass 拒绝-reject")
private String type;
}

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

@@ -0,0 +1,28 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:44
* @Version 1.0
*/
@Data
@ApiModel
public class IntentAreaSettingRequest {
@ApiModelProperty("意向区域-intent 开发区域=dev")
private String type;
@ApiModelProperty("Id")
private Long id;
@ApiModelProperty("战区名称")
private String zoneName;
@ApiModelProperty("组织机构ID集合")
private List<Long> orgIdList;
@ApiModelProperty("开放区域id集合")
private List<Long> openAreaIdList;
}

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

@@ -0,0 +1,31 @@
package com.cool.store.request;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:27
* @Version 1.0
*/
@Data
@ApiModel
public class OpenAreaRequest {
@ApiModelProperty("开发区域ID集合")
private List<Long> idList;
@ApiModelProperty("开放区域状态")
private String status;
@ApiModelProperty("背景banner")
private String backgroundBanner;
@ApiModelProperty("详细Banner")
private String detailBanner;
}

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

@@ -0,0 +1,27 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:58
* @Version 1.0
*/
@Data
@ApiModel
public class AdvancedSettingVO {
private Long id;
private String partnerUrl;
private String tencentVideoAccount;
private String tencentVideoKey;
private List<String> roleIdList;
}

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

@@ -0,0 +1,27 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:47
* @Version 1.0
*/
@Data
@ApiModel
public class IntentAreaSettingVO {
private Long id;
private String zoneName;
private List<orgVO> orgVOS;
private Date updateTime;
private String updateUserId;
}

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

@@ -0,0 +1,36 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/5/30 15:19
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerClerkVO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("伙伴姓名")
private String username;
@ApiModelProperty("关系")
private String relationship;
@ApiModelProperty("年龄")
private Integer age;
@ApiModelProperty("选择原因")
private String chooseReason;
}

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

@@ -0,0 +1,84 @@
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/5/30 15:14
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerIntentInfoVO {
@ApiModelProperty("")
private Long id;
@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 Integer isHaveWantShop;
@ApiModelProperty("意向铺位信息,json字段,最多5个")
private String wantShopInfo;
@ApiModelProperty("最大预算")
private String maxBudget;
@ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代")
private String moneySource;
@ApiModelProperty("资金证明")
private String moneyProve;
@ApiModelProperty("学历")
private String education;
@ApiModelProperty("工作年限")
private String workYear;
@ApiModelProperty("是否具有工作经验")
private Integer isHaveWorkExp;
@ApiModelProperty("工作或经商经验")
private String workExp;
@ApiModelProperty("是否是消费者")
private Integer isConsumer;
@ApiModelProperty("其他品牌")
private String otherBand;
@ApiModelProperty("品牌优势")
private String brandStrength;
@ApiModelProperty("需要改进")
private String needImprove;
@ApiModelProperty("优势")
private String strength;
@ApiModelProperty("劣势")
private String weakness;
@ApiModelProperty("创建时间")
private Date createTime;
}

31
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java
View File

@@ -1,9 +1,40 @@
package com.cool.store.vo;
import com.cool.store.request.PartnerClerkRequest;
import com.cool.store.request.PartnerIntentInfoRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2023/5/31 11:40
* @Version 1.0
*/
@Data
@ApiModel
public class PartnerSummaryInfoVO {
@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("基础信息")
private PartnerBaseInfoVO partnerBaseInfoVO;
@ApiModelProperty("加盟商店员信息列表")
private List<PartnerClerkVO> partnerClerkVOS;
@ApiModelProperty("加盟商意向信息/行业认知")
private PartnerIntentInfoVO partnerIntentInfoVO;
}

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

@@ -0,0 +1,22 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2023/5/31 14:48
* @Version 1.0
*/
@Data
@ApiModel
public class orgVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("组织机构名称")
private String name;
}