From 91ae5ac0ea1c45aa2dc4ae048e25015730d786f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 2 Jun 2023 14:54:58 +0800 Subject: [PATCH] =?UTF-8?q?C=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/BaseUserInfoRequest.java | 2 + .../store/request/PartnerBaseInfoRequest.java | 5 + ...uest.java => PartnerClerkInfoRequest.java} | 14 ++- .../store/request/PartnerClerkRequest.java | 6 -- .../request/PartnerIntentInfoRequest.java | 9 +- .../com/cool/store/vo/OpenAreaTreeVO.java | 36 +++++++ .../cool/store/vo/PartnerLineBaseInfoVO.java | 44 +++++++++ .../com/cool/store/vo/PartnerUserInfoVO.java | 40 ++++++++ .../store/controller/OpenAreaController.java | 48 ++++++--- .../store/controller/PartnerController.java | 97 ++++++++++++------- 10 files changed, 236 insertions(+), 65 deletions(-) rename coolstore-partner-model/src/main/java/com/cool/store/request/{PartnerSummaryInfoRequest.java => PartnerClerkInfoRequest.java} (63%) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java index 92f6d75fa..39baad2ca 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java @@ -34,5 +34,7 @@ public class BaseUserInfoRequest { @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") private Integer acceptAdjustType; + @ApiModelProperty("邀请码") + private String inviteCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java index 8edd2a2fa..6b8dcffd3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java @@ -52,6 +52,11 @@ public class PartnerBaseInfoRequest { private String liveAddress; + @ApiModelProperty("提交标识 提交-true 暂存-false") + private Boolean submitFlag; + + + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java similarity index 63% rename from coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java rename to coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java index bfa6652e4..acd1061c6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java @@ -13,14 +13,18 @@ import java.util.List; */ @ApiModel @Data -public class PartnerSummaryInfoRequest { +public class PartnerClerkInfoRequest { + + + @ApiModelProperty("线索表ID") + private Long partnerLineId; + + @ApiModelProperty("加盟商C端用户表ID partnerId ") + private String partnerId; - @ApiModelProperty("加盟商基本信息对象") - private PartnerBaseInfoRequest partnerBaseInfoRequest; @ApiModelProperty("加盟商店员信息列表") private List partnerClerkRequestList; - @ApiModelProperty("加盟商意向信息/行业认知") - private PartnerIntentInfoRequest partnerIntentInfoRequest; + @ApiModelProperty("提交标识 提交-true 暂存-false") private Boolean submitFlag; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java index f339923c8..63dae051b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java @@ -17,12 +17,6 @@ public class PartnerClerkRequest { @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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java index 92f529ae3..c05046056 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java @@ -16,12 +16,6 @@ public class PartnerIntentInfoRequest { @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; @@ -76,4 +70,7 @@ public class PartnerIntentInfoRequest { @ApiModelProperty("劣势") private String weakness; + @ApiModelProperty("提交标识 提交-true 暂存-false") + private Boolean submitFlag; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java new file mode 100644 index 000000000..e81643ccd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -0,0 +1,36 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/2 10:55 + * @Version 1.0 + */ +@Data +@ApiModel +public class OpenAreaTreeVO { + + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("parent.id") + private Long parentId; + + @ApiModelProperty("区域名称") + private String areaName; + + @ApiModelProperty("区域路径") + private String areaPath; + + @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") + private String areaStatus; + + @ApiModelProperty("子区域") + List childNode; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java new file mode 100644 index 000000000..e99dded87 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java @@ -0,0 +1,44 @@ +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/6/2 14:29 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerLineBaseInfoVO { + + + @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 Date deadline; + + @ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天") + private Date closeTime; + + @ApiModelProperty("冷静期首次登录标识 true-是首次") + private Boolean coolDownFirstLoginFlag; + + @ApiModelProperty("拒绝原因 冷静期提示文案中用到 全部流程中用到(拒绝的时候暂时拒绝原因)") + private String cause; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java new file mode 100644 index 000000000..eb1a9df8f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java @@ -0,0 +1,40 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/2 10:29 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerUserInfoVO { + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("申请人姓名") + private String username; + + @ApiModelProperty("常驻区域") + private String liveArea; + + @ApiModelProperty("意向开店区域") + private String wantShopArea; + + @ApiModelProperty("意向开店区域ID") + private Long wantShopAreaId; + + @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") + private Integer acceptAdjustType; + + @ApiModelProperty("邀请码") + private String inviteCode; + +} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java index 0d0fba973..220cbbcc2 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java @@ -1,6 +1,7 @@ package com.cool.store.controller; import com.cool.store.response.ResponseResult; +import com.cool.store.vo.OpenAreaTreeVO; import com.cool.store.vo.OpenAreaVO; import com.cool.store.vo.OpenProvinceVO; import com.github.pagehelper.PageInfo; @@ -11,6 +12,8 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @Author suzhuhong * @Date 2023/5/29 14:19 @@ -19,31 +22,48 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" }) @Slf4j -@Api(tags = "开发区域城市") +@Api(tags = "小程序开发区域城市") public class OpenAreaController { @GetMapping(path = "/getOpenAreaList") - @ApiOperation("开放城市(重点城市接口 区域申请搜索 )") + @ApiOperation("点击重点城市/可申请加盟省份/可预约加盟省份 子列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "keyOpenFlag", value = "重点城市标识 重点城市查询入参", required = false), @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), - @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false), - @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false), - @ApiImplicitParam(name = "pageNumber", value = "页码", required = false), - @ApiImplicitParam(name = "pageSize", value = "分页大小", required = false) + @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) }) - public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "keyOpenFlag",required = false)Boolean keyOpenFlag, - @RequestParam(value = "parentId",required = false)Long parentId, - @RequestParam(value = "type",required = false)String type, - @RequestParam(value = "keyWord",required = false)String keyWord, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "parentId",required = false)Long parentId, + @RequestParam(value = "type",required = false)String type){ + return ResponseResult.success(); } + @GetMapping(path = "/areaApplyQuery") + @ApiOperation("区域申请搜索 树形结构") + @ApiImplicitParams({ + @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false), + }) + public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "keyWord",required = false)String keyWord){ + + + return ResponseResult.success(); + } + + + @GetMapping(path = "/getKeyOpenAreaList") + @ApiOperation("重点开放城市列表)") + public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", 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(); + } + + + @GetMapping(path = "/getOpenProvince") @ApiOperation("可申请加盟省份/可预约加盟省份") public ResponseResult getOpenProvince(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){ diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index c7ac720d6..769e73669 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -1,13 +1,11 @@ package com.cool.store.controller; import com.cool.store.request.BaseUserInfoRequest; -import com.cool.store.request.PartnerSummaryInfoRequest; -import com.cool.store.request.PartnerSummaryInfoRequest; +import com.cool.store.request.PartnerBaseInfoRequest; +import com.cool.store.request.PartnerClerkInfoRequest; +import com.cool.store.request.PartnerIntentInfoRequest; 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.cool.store.vo.*; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -38,17 +36,6 @@ public class PartnerController { } - @PostMapping(path = "/changeBaseInfo") - @ApiOperation("变更基本信息") - public ResponseResult changeBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody BaseUserInfoRequest baseUserInfoRequest){ - - //前提 未提交加盟申请 - //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 - return ResponseResult.success(); - } - - @GetMapping(path = "/getSubmitIntentionApplyFlag") @ApiOperation("获取提交意向申请标识 true 已提交 false 未提交") public ResponseResult getSubmitIntentionApplyFlag(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){ @@ -81,42 +68,66 @@ public class PartnerController { @RequestParam(value = "idCard",required = false)String idCard, @RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(); } - @PostMapping(path = "/submitPartnerSummaryInfo") - @ApiOperation("提交加盟商汇总信息") - public ResponseResult submitPartnerSummaryInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){ + @PostMapping(path = "/submitPartnerBaseInfo") + @ApiOperation("提交加盟商基本信息") + public ResponseResult submitPartnerBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody PartnerBaseInfoRequest PartnerBaseInfoRequest){ //前提 未提交加盟申请 //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 return ResponseResult.success(); } + @PostMapping(path = "/submitPartnerClerkInfo") + @ApiOperation("提交加盟商店员信息") + public ResponseResult submitPartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ - - @PostMapping(path = "/changePartnerSummaryInfo") - @ApiOperation("修改加盟商汇总信息 修改意向信息 修改店员信息 修改行业认知") - public ResponseResult changePartnerSummaryInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){ - - //前提 未提交加盟申请 - //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 return ResponseResult.success(); } + @PostMapping(path = "/submitPartnerIntentInfo") + @ApiOperation("提交加盟商意向信息/行业认知") + public ResponseResult submitPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + + return ResponseResult.success(); + } + + + + @PostMapping(path = "/changePartnerClerkInfo") + @ApiOperation("修改加盟商店员信息") + public ResponseResult changePartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ + + return ResponseResult.success(); + } + + + @PostMapping(path = "/changePartnerIntentInfo") + @ApiOperation("修改加盟商意向信息/行业认知") + public ResponseResult changePartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + + return ResponseResult.success(); + } + + + @GetMapping(path = "/getPartnerLineDetail") - @ApiOperation("查询加盟商线索详情 包括冷静期是否首次登录") + @ApiOperation("查询加盟商线索详情(适用全部流程) 包括冷静期是否首次登录") @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + @ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false), }) - public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success(); @@ -136,11 +147,29 @@ public class PartnerController { } + @GetMapping(path = "/completeJoinNotice") + @ApiOperation("提交加盟须知") + @ApiImplicitParams({ + @ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false), + }) + public ResponseResult completeJoinNotice(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "partnerId",required = false)Long partnerId){ + return ResponseResult.success(); + } + @GetMapping(path = "/queryJoinNotice") + @ApiOperation("查询是否填写加盟须知") + @ApiImplicitParams({ + @ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false), + }) + public ResponseResult queryJoinNotice(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "partnerId",required = false)Long partnerId){ + return ResponseResult.success(); + } }