From 2bf824e539ea76beadb16d5fa6677a3cd9ed602c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 6 Jun 2023 09:49:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/PartnerIntentInfoRequest.java | 4 +- .../cool/store/request/StageCountRequest.java | 3 - .../java/com/cool/store/vo/BlackListVO.java | 67 ++++++++++++++++ .../store/vo/PartnerIntentApplyInfoVO.java | 3 + .../cool/store/vo/PartnerIntentInfoVO.java | 3 +- .../cool/store/vo/PartnerInterviewInfoVO.java | 5 +- .../cool/store/vo/PartnerLineDetailVO.java | 13 --- ...geInfoVO.java => PublicSeaLineListVo.java} | 10 +-- .../cool/store/controller/DeskController.java | 80 ++++++++++++++++--- .../store/controller/PartnerController.java | 2 +- 10 files changed, 150 insertions(+), 40 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java rename coolstore-partner-model/src/main/java/com/cool/store/vo/{PartnerStageInfoVO.java => PublicSeaLineListVo.java} (84%) 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 c05046056..65d164d98 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 @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author suzhuhong * @Date 2023/5/30 15:14 @@ -38,7 +40,7 @@ public class PartnerIntentInfoRequest { private String moneySource; @ApiModelProperty("资金证明") - private String moneyProve; + private List moneyProve; @ApiModelProperty("学历") private String education; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java index 1a182399d..dfb6598da 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java @@ -16,7 +16,4 @@ public class StageCountRequest extends PageInfoRequest { @ApiModelProperty("类型 待处理-Pending 待跟进-follow") private String type; - @ApiModelProperty("流程阶段") - private String workflowStage; - } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java new file mode 100644 index 000000000..acf68c1b3 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java @@ -0,0 +1,67 @@ +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 16:06 + * @Version 1.0 + */ +@Data +@ApiModel +public class BlackListVO { + + @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("加盟商用户ID") + private String partnerUserId; + + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + + @ApiModelProperty("加盟商用户手机号") + private String partnerUserPhone; + + @ApiModelProperty("手机号归属地") + private String phoneAddress; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("操作时间") + private Date closeTime; + + @ApiModelProperty("操作人ID") + private String closeUserId; + + @ApiModelProperty("操作人名称") + private String closeUserName; + + @ApiModelProperty("结束人员手机号") + private String closeUserPhone; + + @ApiModelProperty("结束人员手机号归属地") + private String closeUserPhoneAddress; + + + + + + + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java index cc5af6000..69cced4ba 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java @@ -19,6 +19,9 @@ public class PartnerIntentApplyInfoVO { @ApiModelProperty("") private Long id; + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + @ApiModelProperty("hy_partner_user_info.partner_id") private String partnerId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java index be98c2254..fb2d1271c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Author suzhuhong @@ -46,7 +47,7 @@ public class PartnerIntentInfoVO { private String moneySource; @ApiModelProperty("资金证明") - private String moneyProve; + private List moneyProve; @ApiModelProperty("学历") private String education; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java index 12e5c3895..77eb11cee 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java @@ -19,6 +19,9 @@ public class PartnerInterviewInfoVO { @ApiModelProperty("") private Long id; + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝") private Integer status; @@ -28,7 +31,7 @@ public class PartnerInterviewInfoVO { @ApiModelProperty("hy_partner_interview_arrangement.id") private Long interviewArrangementId; - @ApiModelProperty("hy_partner_user_info.partner_id") + @ApiModelProperty("加盟商用户ID") private String partnerId; @ApiModelProperty("截止时间") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java index 4de0b32d3..2da1ce719 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java @@ -47,19 +47,6 @@ public class PartnerLineDetailVO { @ApiModelProperty("用户画像") private String userPortrait; - @ApiModelProperty("意向审核信息") - private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO; - - - @ApiModelProperty("预约面试、合格资格面试 信息") - private PartnerInterviewInfoVO partnerInterviewInfoVO; - - @ApiModelProperty("邀请门店基本信息") - private InviteCodeDetailVO inviteCodeDetailVO; - - @ApiModelProperty("跟进历史") - List lineFollowHistoryVOList; - diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerStageInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java similarity index 84% rename from coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerStageInfoVO.java rename to coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java index 8123f67ff..bbf5f5acb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerStageInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java @@ -13,7 +13,7 @@ import java.util.Date; */ @Data @ApiModel -public class PartnerStageInfoVO { +public class PublicSeaLineListVo { @ApiModelProperty("线索ID") @@ -40,7 +40,7 @@ public class PartnerStageInfoVO { @ApiModelProperty("手机号归属地") private String phoneAddress; @ApiModelProperty("创建时间") - private String createTime; + private Date createTime; @ApiModelProperty("面试开始时间") private Date partnerInterviewStartTime; @@ -60,10 +60,4 @@ public class PartnerStageInfoVO { @ApiModelProperty("跟进次数") private Integer followCount; - @ApiModelProperty("意向审核信息") - private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO; - - @ApiModelProperty("预约面试、合格资格面试 信息") - private PartnerInterviewInfoVO partnerInterviewInfoVO; - } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index e24415f56..fa1f04528 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -32,32 +32,88 @@ public class DeskController { } - @PostMapping(path = "/queryStageCount") + @GetMapping(path = "/queryStageCount") @ApiOperation("招商经理视角====各阶段待处理待跟进数量") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + }) public ResponseResult queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody StageCountRequest stageCountRequest){ + @RequestParam(value = "type",required = false)Integer type){ return ResponseResult.success(); } - @PostMapping(path = "/queryStageList") - @ApiOperation("招商经理视角====各阶段待数据列表") - public ResponseResult> queryStageList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody StageCountRequest stageCountRequest){ + @PostMapping(path = "/queryIntentApplyList") + @ApiOperation("招商经理视角===意向申请审核列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + }) + public ResponseResult> queryIntentApplyList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "type",required = false)Integer type){ + + return ResponseResult.success(); + } + + + @PostMapping(path = "/querySubscribeInterviewTimeList") + @ApiOperation("招商经理视角===预约面试时间/合格资格面试 列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + }) + public ResponseResult> querySubscribeInterviewTimeList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "type",required = false)Integer type){ return ResponseResult.success(); } @GetMapping(path = "/getPartnerLineDetail") - @ApiOperation("查询加盟商线索详情 包括冷静期是否首次登录") + @ApiOperation("查询加盟商线索详情 线索信息与基本信息") @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, @RequestParam(value = "lineId",required = false)Long lineId){ + return ResponseResult.success(); + } + + + @GetMapping(path = "/getPartnerIntentInfo") + @ApiOperation("查询加盟商线索详情 意向信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + }) + public ResponseResult getPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "lineId",required = false)Long lineId){ + + + return ResponseResult.success(); + } + + + @GetMapping(path = "/getPartnerIntentInfo") + @ApiOperation("查询加盟商线索详情 邀请码信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), + }) + public ResponseResult getInviteCodeDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "partnerId",required = false)Long partnerId){ + + + return ResponseResult.success(); + } + + + @GetMapping(path = "/getFollowHistory") + @ApiOperation("查询加盟商线索详情 跟进历史") + @ApiImplicitParams({ + @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), + }) + public ResponseResult> getFollowHistory(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestParam(value = "partnerId",required = false)Long partnerId){ + return ResponseResult.success(); } @@ -80,7 +136,7 @@ public class DeskController { @PostMapping(path = "/allocationInvestmentManager") @ApiOperation("分配招商经理/转让招商经理") - public ResponseResult> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + public ResponseResult allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, @RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){ return ResponseResult.success(); @@ -90,7 +146,7 @@ public class DeskController { @PostMapping(path = "/queryPublicSeqLineList") @ApiOperation("公海列表") - public ResponseResult> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + public ResponseResult> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, @RequestBody LineRequest LineRequest){ return ResponseResult.success(); @@ -111,8 +167,8 @@ public class DeskController { @PostMapping(path = "/queryBlackList") @ApiOperation("黑名单列表") - public ResponseResult> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody LineRequest LineRequest){ + public ResponseResult> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, + @RequestBody LineRequest LineRequest){ return ResponseResult.success(); } @@ -138,7 +194,7 @@ public class DeskController { @PostMapping(path = "/closeOrPassFollow") - @ApiOperation("结束跟进/通过流程") + @ApiOperation("意向申请审核 结束跟进/通过流程") public ResponseResult closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, @RequestBody CloseFollowRequest closeFollowRequest){ 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 d387c74a7..ff8c0fecf 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 @@ -123,7 +123,7 @@ public class PartnerController { - @GetMapping(path = "/getPartnerLinBaseInfo") + @GetMapping(path = "/getPartnerLineBaseInfo") @ApiOperation("查询加盟商线索详情(适用全部流程) 包括冷静期是否首次登录") @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false), From 5eebbc9cf3ea07a7ee063e4f151d5f1fab4bb5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 6 Jun 2023 14:20:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B7=AF=E5=BE=84enterpr?= =?UTF-8?q?ise-id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/controller/DeskController.java | 80 +++++++------------ .../controller/EnterpriseUserController.java | 2 +- .../controller/MiniProgramAppController.java | 2 +- .../store/controller/OpenAreaController.java | 13 ++- .../store/controller/PartnerController.java | 46 ++++------- 5 files changed, 50 insertions(+), 93 deletions(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index fa1f04528..b5a0aa75a 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -25,8 +25,7 @@ public class DeskController { @GetMapping(path = "/interviewSchedule") @ApiOperation("面试日程信息 面试信息有限 不做分页") - public ResponseResult interviewSchedule(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "selectedData",required = false) Date selectedData){ + public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){ return ResponseResult.success(); } @@ -37,8 +36,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), }) - public ResponseResult queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "type",required = false)Integer type){ + public ResponseResult queryStageCount(@RequestParam(value = "type",required = false)Integer type){ return ResponseResult.success(); } @@ -49,8 +47,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), }) - public ResponseResult> queryIntentApplyList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "type",required = false)Integer type){ + public ResponseResult> queryIntentApplyList(@RequestParam(value = "type",required = false)Integer type){ return ResponseResult.success(); } @@ -61,8 +58,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), }) - public ResponseResult> querySubscribeInterviewTimeList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "type",required = false)Integer type){ + public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)Integer type){ return ResponseResult.success(); } @@ -73,8 +69,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult getPartnerLineDetail(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); } @@ -85,8 +80,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); @@ -98,8 +92,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), }) - public ResponseResult getInviteCodeDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "partnerId",required = false)Long partnerId){ + public ResponseResult getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success(); @@ -111,8 +104,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), }) - public ResponseResult> getFollowHistory(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "partnerId",required = false)Long partnerId){ + public ResponseResult> getFollowHistory(@RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success(); @@ -125,8 +117,7 @@ public class DeskController { @ApiImplicitParam(name = "pageNumber", value = "页码", required = false), @ApiImplicitParam(name = "pageSize", value = "分页大小", required = false) }) - public ResponseResult> lastMonthCloseLine(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + public ResponseResult> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ @@ -136,8 +127,7 @@ public class DeskController { @PostMapping(path = "/allocationInvestmentManager") @ApiOperation("分配招商经理/转让招商经理") - public ResponseResult allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){ + public ResponseResult allocationInvestmentManager(@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){ return ResponseResult.success(); } @@ -146,8 +136,7 @@ public class DeskController { @PostMapping(path = "/queryPublicSeqLineList") @ApiOperation("公海列表") - public ResponseResult> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody LineRequest LineRequest){ + public ResponseResult> queryPublicSeaLineList(@RequestBody LineRequest LineRequest){ return ResponseResult.success(); } @@ -157,8 +146,7 @@ public class DeskController { @PostMapping(path = "/queryPrivateSeaLineList") @ApiOperation("私海列表") - public ResponseResult> queryPrivateSeqLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ + public ResponseResult> queryPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ return ResponseResult.success(); } @@ -167,8 +155,7 @@ public class DeskController { @PostMapping(path = "/queryBlackList") @ApiOperation("黑名单列表") - public ResponseResult> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody LineRequest LineRequest){ + public ResponseResult> queryBlackList(@RequestBody LineRequest LineRequest){ return ResponseResult.success(); } @@ -176,8 +163,7 @@ public class DeskController { @PostMapping(path = "/removeBlackList") @ApiOperation("移出黑名单") - public ResponseResult removeBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody LineBlackListRequest lineBlackListRequest){ + public ResponseResult removeBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ return ResponseResult.success(); @@ -185,8 +171,7 @@ public class DeskController { @PostMapping(path = "/joinBlackList") @ApiOperation("加入黑名单") - public ResponseResult joinBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody LineBlackListRequest lineBlackListRequest){ + public ResponseResult joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ return ResponseResult.success(); @@ -195,8 +180,7 @@ public class DeskController { @PostMapping(path = "/closeOrPassFollow") @ApiOperation("意向申请审核 结束跟进/通过流程") - public ResponseResult closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody CloseFollowRequest closeFollowRequest){ + public ResponseResult closeFollow(@RequestBody CloseFollowRequest closeFollowRequest){ return ResponseResult.success(); @@ -204,8 +188,7 @@ public class DeskController { @PostMapping(path = "/changeIntentInfo") @ApiOperation("员工端变更C端用户意向信息") - public ResponseResult changeIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody BaseUserInfoRequest baseUserInfoRequest){ + public ResponseResult changeIntentInfo( @RequestBody BaseUserInfoRequest baseUserInfoRequest){ return ResponseResult.success(); } @@ -213,8 +196,7 @@ public class DeskController { @PostMapping(path = "/addTags") @ApiOperation("添加标签接口") - public ResponseResult addTags(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody AddTagsRequest addTagsRequest){ + public ResponseResult addTags(@RequestBody AddTagsRequest addTagsRequest){ return ResponseResult.success(); } @@ -224,8 +206,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult queryPartnerIntentApplyInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); } @@ -239,8 +220,7 @@ public class DeskController { @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false), @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false) }) - public ResponseResult> getOpenAreaTree(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "parentId",required = false)Long parentId, + public ResponseResult> getOpenAreaTree(@RequestParam(value = "parentId",required = false)Long parentId, @RequestParam(value = "type",required = false)String type, @RequestParam(value = "keyWord",required = false)String keyWord){ return ResponseResult.success(); @@ -250,8 +230,7 @@ public class DeskController { @PostMapping(path = "/changeOpenAreaStatus") @ApiOperation("变更开放区域状态") - public ResponseResult changeOpenAreaStatus(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody OpenAreaRequest openAreaRequest){ + public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ return ResponseResult.success(); } @@ -259,16 +238,14 @@ public class DeskController { @PostMapping(path = "/addZone") @ApiOperation("新建意向战区/开发战区") - public ResponseResult addZone(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ + public ResponseResult addZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ return ResponseResult.success(); } @PostMapping(path = "/updateZone") @ApiOperation("编辑意向战区/开发战区") - public ResponseResult updateZone(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ + public ResponseResult updateZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ return ResponseResult.success(); } @@ -280,8 +257,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), }) - public ResponseResult> getZoneList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "type",required = false)String type, + public ResponseResult> getZoneList(@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(); @@ -293,15 +269,14 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), }) - public ResponseResult> deletedZoneList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "id",required = false)Long id){ + public ResponseResult> deletedZoneList(@RequestParam(value = "id",required = false)Long id){ return ResponseResult.success(); } @GetMapping(path = "/getAdvanceSetting") @ApiOperation("查询企业高级设置") - public ResponseResult getAdvanceSetting(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){ + public ResponseResult getAdvanceSetting(){ return ResponseResult.success(); @@ -309,8 +284,7 @@ public class DeskController { @GetMapping(path = "/changeAdvanceSetting") @ApiOperation("新增或者修改高级设置") - public ResponseResult getAdvanceSetting(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody AdvancedSettingRequest advancedSettingRequest){ + public ResponseResult getAdvanceSetting(@RequestBody AdvancedSettingRequest advancedSettingRequest){ return ResponseResult.success(); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java index 890019e5f..907f4533c 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java @@ -21,7 +21,7 @@ import java.util.List; * @date 2023-05-30 17:20 */ @RestController -@RequestMapping({"/enterprises/{enterpriseId}/users"}) +@RequestMapping({"/enterprises/users"}) @Slf4j public class EnterpriseUserController { diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java index 6ed6ba97a..39cf09cf6 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java @@ -23,7 +23,7 @@ import javax.validation.Valid; @Api(tags = "微信小程序app接口") @RestController -@RequestMapping({"/v1/partnerManage/{enterpriseId}/miniProgram" }) +@RequestMapping({"/v1/partnerManage/miniProgram" }) public class MiniProgramAppController { @Resource 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 220cbbcc2..29ca427cb 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 @@ -20,7 +20,7 @@ import java.util.List; * @Version 1.0 */ @RestController -@RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" }) +@RequestMapping({"/v1/partnerManage/openArea" }) @Slf4j @Api(tags = "小程序开发区域城市") public class OpenAreaController { @@ -32,8 +32,7 @@ public class OpenAreaController { @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) }) - public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "parentId",required = false)Long parentId, + public ResponseResult> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId, @RequestParam(value = "type",required = false)String type){ return ResponseResult.success(); @@ -45,8 +44,7 @@ public class OpenAreaController { @ApiImplicitParams({ @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false), }) - public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "keyWord",required = false)String keyWord){ + public ResponseResult> getOpenAreaList(@RequestParam(value = "keyWord",required = false)String keyWord){ return ResponseResult.success(); @@ -55,8 +53,7 @@ public class OpenAreaController { @GetMapping(path = "/getKeyOpenAreaList") @ApiOperation("重点开放城市列表)") - public ResponseResult> getOpenAreaList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + public ResponseResult> getOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ return ResponseResult.success(); @@ -66,7 +63,7 @@ public class OpenAreaController { @GetMapping(path = "/getOpenProvince") @ApiOperation("可申请加盟省份/可预约加盟省份") - public ResponseResult getOpenProvince(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){ + public ResponseResult getOpenProvince(){ return ResponseResult.success(); } 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 ff8c0fecf..bc6c18863 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 @@ -22,7 +22,7 @@ import java.util.List; * @Version 1.0 */ @RestController -@RequestMapping({"/v1/partnerManage/{enterpriseId}/partner" }) +@RequestMapping({"/v1/partnerManage/partner" }) @Slf4j @Api(tags = "加盟商信息") public class PartnerController { @@ -31,8 +31,7 @@ public class PartnerController { @PostMapping(path = "/applyBaseInfo") @ApiOperation("提交基本信息") - public ResponseResult applyBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody BaseUserInfoRequest baseUserInfoRequest){ + public ResponseResult applyBaseInfo(@RequestBody BaseUserInfoRequest baseUserInfoRequest){ return ResponseResult.success(); } @@ -40,7 +39,7 @@ public class PartnerController { @GetMapping(path = "/getSubmitIntentionApplyFlag") @ApiOperation("获取提交意向申请标识 true 已提交 false 未提交") - public ResponseResult getSubmitIntentionApplyFlag(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){ + public ResponseResult getSubmitIntentionApplyFlag(){ return ResponseResult.success(); @@ -52,8 +51,7 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "idCard", value = "身份证号码", required = false), }) - public ResponseResult getLineByIdCard(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "idCard",required = false)String idCard){ + public ResponseResult getLineByIdCard(@RequestParam(value = "idCard",required = false)String idCard){ return ResponseResult.success(); @@ -66,8 +64,7 @@ public class PartnerController { @ApiImplicitParam(name = "idCard", value = "身份证号码", required = false), @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult changeBinding(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "idCard",required = false)String idCard, + public ResponseResult changeBinding(@RequestParam(value = "idCard",required = false)String idCard, @RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); @@ -76,8 +73,7 @@ public class PartnerController { @PostMapping(path = "/submitPartnerBaseInfo") @ApiOperation("提交加盟商基本信息") - public ResponseResult submitPartnerBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerBaseInfoRequest PartnerBaseInfoRequest){ + public ResponseResult submitPartnerBaseInfo(@RequestBody PartnerBaseInfoRequest PartnerBaseInfoRequest){ //前提 未提交加盟申请 //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 @@ -86,8 +82,7 @@ public class PartnerController { @PostMapping(path = "/submitPartnerClerkInfo") @ApiOperation("提交加盟商店员信息") - public ResponseResult submitPartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ + public ResponseResult submitPartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ return ResponseResult.success(); } @@ -95,8 +90,7 @@ public class PartnerController { @PostMapping(path = "/submitPartnerIntentInfo") @ApiOperation("提交加盟商意向信息/行业认知") - public ResponseResult submitPartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + public ResponseResult submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ return ResponseResult.success(); } @@ -105,8 +99,7 @@ public class PartnerController { @PostMapping(path = "/changePartnerClerkInfo") @ApiOperation("修改加盟商店员信息") - public ResponseResult changePartnerClerkInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ + public ResponseResult changePartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ return ResponseResult.success(); } @@ -114,8 +107,7 @@ public class PartnerController { @PostMapping(path = "/changePartnerIntentInfo") @ApiOperation("修改加盟商意向信息/行业认知") - public ResponseResult changePartnerIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + public ResponseResult changePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ return ResponseResult.success(); } @@ -128,8 +120,7 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false), }) - public ResponseResult getPartnerLinBaseInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId, - @RequestParam(value = "partnerId",required = false)Long partnerId){ + public ResponseResult getPartnerLinBaseInfo(@RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success(); @@ -142,8 +133,7 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult queryPartnerBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult queryPartnerBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); @@ -155,8 +145,7 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult> queryPartnerClerkInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult> queryPartnerClerkInfo(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); @@ -168,8 +157,7 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult queryPartnerIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult queryPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(); @@ -183,8 +171,7 @@ public class PartnerController { @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){ + public ResponseResult completeJoinNotice(@RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success(); @@ -196,8 +183,7 @@ public class PartnerController { @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){ + public ResponseResult queryJoinNotice(@RequestParam(value = "partnerId",required = false)Long partnerId){ return ResponseResult.success();