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

141
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/**
* @Author suzhuhong
@@ -25,7 +26,7 @@ public class DeskController {
@GetMapping(path = "/interviewSchedule")
@ApiOperation("面试日程信息 面试信息有限 不做分页")
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "selectedData",required = false) Date selectedData){
return ResponseResult.success();
@@ -34,7 +35,7 @@ public class DeskController {
@PostMapping(path = "/queryStageCount")
@ApiOperation("招商经理视角====各阶段待处理待跟进数量")
public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody StageCountRequest stageCountRequest){
return ResponseResult.success();
@@ -43,7 +44,7 @@ public class DeskController {
@PostMapping(path = "/queryStageList")
@ApiOperation("招商经理视角====各阶段待数据列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryStageList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryStageList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody StageCountRequest stageCountRequest){
return ResponseResult.success();
@@ -55,7 +56,7 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
@@ -65,7 +66,13 @@ public class DeskController {
@GetMapping(path = "/lastMonthCloseLine")
@ApiOperation("最近30天结束的线索")
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNumber", value = "页码", required = false),
@ApiImplicitParam(name = "pageSize", value = "分页大小", required = false)
})
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
return ResponseResult.success();
@@ -74,7 +81,7 @@ public class DeskController {
@PostMapping(path = "/allocationInvestmentManager")
@ApiOperation("分配招商经理/转让招商经理")
public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){
return ResponseResult.success();
@@ -84,7 +91,7 @@ public class DeskController {
@PostMapping(path = "/queryPublicSeqLineList")
@ApiOperation("公海列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
return ResponseResult.success();
@@ -95,7 +102,7 @@ public class DeskController {
@PostMapping(path = "/queryPrivateSeaLineList")
@ApiOperation("私海列表")
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
return ResponseResult.success();
@@ -105,7 +112,7 @@ public class DeskController {
@PostMapping(path = "/queryBlackList")
@ApiOperation("黑名单列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
return ResponseResult.success();
@@ -113,7 +120,8 @@ public class DeskController {
@PostMapping(path = "/removeBlackList")
public ResponseResult<Boolean> removeBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@ApiOperation("移出黑名单")
public ResponseResult<Boolean> removeBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
@@ -121,7 +129,8 @@ public class DeskController {
}
@PostMapping(path = "/joinBlackList")
public ResponseResult<Boolean> joinBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@ApiOperation("加入黑名单")
public ResponseResult<Boolean> joinBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
@@ -129,8 +138,9 @@ public class DeskController {
}
@PostMapping(path = "/closeFollow")
public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@PostMapping(path = "/closeOrPassFollow")
@ApiOperation("结束跟进/通过流程")
public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody CloseFollowRequest closeFollowRequest){
@@ -139,7 +149,7 @@ public class DeskController {
@PostMapping(path = "/changeIntentInfo")
@ApiOperation("员工端变更C端用户意向信息")
public ResponseResult<Boolean> changeIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<Boolean> changeIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
return ResponseResult.success();
@@ -148,12 +158,113 @@ public class DeskController {
@PostMapping(path = "/addTags")
@ApiOperation("添加标签接口")
public ResponseResult<Boolean> addTags(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
public ResponseResult<Boolean> addTags(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody AddTagsRequest addTagsRequest){
return ResponseResult.success();
}
@GetMapping(path = "/queryPartnerIntentApplyInfo")
@ApiOperation("查看意向审核信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentApplyInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}
@GetMapping(path = "/getOpenAreaTree")
@ApiOperation("开放城市树")
@ApiImplicitParams({
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false),
@ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false)
})
public ResponseResult<List<OpenAreaVO>> getOpenAreaTree(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "parentId",required = false)Long parentId,
@RequestParam(value = "type",required = false)String type,
@RequestParam(value = "keyWord",required = false)String keyWord){
return ResponseResult.success();
}
@PostMapping(path = "/changeOpenAreaStatus")
@ApiOperation("变更开放区域状态")
public ResponseResult<Boolean> changeOpenAreaStatus(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody OpenAreaRequest openAreaRequest){
return ResponseResult.success();
}
@PostMapping(path = "/addZone")
@ApiOperation("新建意向战区/开发战区")
public ResponseResult<Boolean> addZone(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
return ResponseResult.success();
}
@PostMapping(path = "/updateZone")
@ApiOperation("编辑意向战区/开发战区")
public ResponseResult<Boolean> updateZone(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
return ResponseResult.success();
}
@GetMapping(path = "/getZoneList")
@ApiOperation("战区列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false),
})
public ResponseResult<List<OpenAreaVO>> getZoneList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "type",required = false)String type,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
return ResponseResult.success();
}
@GetMapping(path = "/deletedZoneList")
@ApiOperation("删除战区")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false),
})
public ResponseResult<List<OpenAreaVO>> deletedZoneList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "id",required = false)Long id){
return ResponseResult.success();
}
@GetMapping(path = "/getAdvanceSetting")
@ApiOperation("查询企业高级设置")
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){
return ResponseResult.success();
}
@GetMapping(path = "/changeAdvanceSetting")
@ApiOperation("新增或者修改高级设置")
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestBody AdvancedSettingRequest advancedSettingRequest){
return ResponseResult.success();
}

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.vo.OpenAreaVO;
import com.cool.store.vo.OpenProvinceVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" })
@Slf4j
@Api(tags = "开发区域城市")
public class OpenAreaController {

16
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -7,7 +7,9 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.vo.OpenAreaVO;
import com.cool.store.vo.PartnerLineDetailVO;
import com.cool.store.vo.PartnerLineInfoVO;
import com.cool.store.vo.PartnerSummaryInfoVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/partner" })
@Slf4j
@Api(tags = "加盟商信息")
public class PartnerController {
@@ -120,6 +123,19 @@ public class PartnerController {
}
@GetMapping(path = "/queryPartnerIntentInfo")
@ApiOperation("查看意向申请书")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}