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:
zhangchenbiao
2023-06-06 17:32:56 +08:00
parent 2d0d896a58 5eebbc9cf3
commit 23f26ee0ed
13 changed files with 185 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,38 +25,86 @@ public class DeskController {
@GetMapping(path = "/interviewSchedule")
@ApiOperation("面试日程信息 面试信息有限 不做分页")
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "selectedData",required = false) Date selectedData){
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){
return ResponseResult.success();
}
@PostMapping(path = "/queryStageCount")
@GetMapping(path = "/queryStageCount")
@ApiOperation("招商经理视角====各阶段待处理待跟进数量")
public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody StageCountRequest stageCountRequest){
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false),
})
public ResponseResult<StageCountVO> queryStageCount(@RequestParam(value = "type",required = false)Integer type){
return ResponseResult.success();
}
@PostMapping(path = "/queryStageList")
@ApiOperation("招商经理视角====各阶段待数据列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> 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<PageInfo<PartnerIntentApplyInfoVO>> queryIntentApplyList(@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<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@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<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}
@GetMapping(path = "/getPartnerIntentInfo")
@ApiOperation("查询加盟商线索详情 意向信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerIntentApplyInfoVO> getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}
@GetMapping(path = "/getPartnerIntentInfo")
@ApiOperation("查询加盟商线索详情 邀请码信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
})
public ResponseResult<InviteCodeDetailVO> getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
}
@GetMapping(path = "/getFollowHistory")
@ApiOperation("查询加盟商线索详情 跟进历史")
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
})
public ResponseResult<List<LineFollowHistoryVO>> getFollowHistory(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
@@ -69,8 +117,7 @@ public class DeskController {
@ApiImplicitParam(name = "pageNumber", value = "页码", required = false),
@ApiImplicitParam(name = "pageSize", value = "分页大小", required = false)
})
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
@@ -80,8 +127,7 @@ public class DeskController {
@PostMapping(path = "/allocationInvestmentManager")
@ApiOperation("分配招商经理/转让招商经理")
public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){
public ResponseResult<Boolean> allocationInvestmentManager(@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){
return ResponseResult.success();
}
@@ -90,8 +136,7 @@ public class DeskController {
@PostMapping(path = "/queryPublicSeqLineList")
@ApiOperation("公海列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
public ResponseResult<PageInfo<PublicSeaLineListVo>> queryPublicSeaLineList(@RequestBody LineRequest LineRequest){
return ResponseResult.success();
}
@@ -101,8 +146,7 @@ public class DeskController {
@PostMapping(path = "/queryPrivateSeaLineList")
@ApiOperation("私海列表")
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
return ResponseResult.success();
}
@@ -111,8 +155,7 @@ public class DeskController {
@PostMapping(path = "/queryBlackList")
@ApiOperation("黑名单列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
public ResponseResult<PageInfo<BlackListVO>> queryBlackList(@RequestBody LineRequest LineRequest){
return ResponseResult.success();
}
@@ -120,8 +163,7 @@ public class DeskController {
@PostMapping(path = "/removeBlackList")
@ApiOperation("移出黑名单")
public ResponseResult<Boolean> removeBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
public ResponseResult<Boolean> removeBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){
return ResponseResult.success();
@@ -129,8 +171,7 @@ public class DeskController {
@PostMapping(path = "/joinBlackList")
@ApiOperation("加入黑名单")
public ResponseResult<Boolean> joinBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
public ResponseResult<Boolean> joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){
return ResponseResult.success();
@@ -138,9 +179,8 @@ public class DeskController {
@PostMapping(path = "/closeOrPassFollow")
@ApiOperation("结束跟进/通过流程")
public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody CloseFollowRequest closeFollowRequest){
@ApiOperation("意向申请审核 结束跟进/通过流程")
public ResponseResult<Boolean> closeFollow(@RequestBody CloseFollowRequest closeFollowRequest){
return ResponseResult.success();
@@ -148,8 +188,7 @@ public class DeskController {
@PostMapping(path = "/changeIntentInfo")
@ApiOperation("员工端变更C端用户意向信息")
public ResponseResult<Boolean> changeIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
public ResponseResult<Boolean> changeIntentInfo( @RequestBody BaseUserInfoRequest baseUserInfoRequest){
return ResponseResult.success();
}
@@ -157,8 +196,7 @@ public class DeskController {
@PostMapping(path = "/addTags")
@ApiOperation("添加标签接口")
public ResponseResult<Boolean> addTags(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody AddTagsRequest addTagsRequest){
public ResponseResult<Boolean> addTags(@RequestBody AddTagsRequest addTagsRequest){
return ResponseResult.success();
}
@@ -168,8 +206,7 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentApplyInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}
@@ -183,8 +220,7 @@ public class DeskController {
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false),
@ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false)
})
public ResponseResult<List<OpenAreaVO>> getOpenAreaTree(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "parentId",required = false)Long parentId,
public ResponseResult<List<OpenAreaVO>> 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();
@@ -194,8 +230,7 @@ public class DeskController {
@PostMapping(path = "/changeOpenAreaStatus")
@ApiOperation("变更开放区域状态")
public ResponseResult<Boolean> changeOpenAreaStatus(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody OpenAreaRequest openAreaRequest){
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
return ResponseResult.success();
}
@@ -203,16 +238,14 @@ public class DeskController {
@PostMapping(path = "/addZone")
@ApiOperation("新建意向战区/开发战区")
public ResponseResult<Boolean> addZone(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
public ResponseResult<Boolean> addZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
return ResponseResult.success();
}
@PostMapping(path = "/updateZone")
@ApiOperation("编辑意向战区/开发战区")
public ResponseResult<Boolean> updateZone(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
public ResponseResult<Boolean> updateZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
return ResponseResult.success();
}
@@ -224,8 +257,7 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false),
})
public ResponseResult<List<OpenAreaVO>> getZoneList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "type",required = false)String type,
public ResponseResult<List<OpenAreaVO>> 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();
@@ -237,15 +269,14 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false),
})
public ResponseResult<List<OpenAreaVO>> deletedZoneList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "id",required = false)Long id){
public ResponseResult<List<OpenAreaVO>> deletedZoneList(@RequestParam(value = "id",required = false)Long id){
return ResponseResult.success();
}
@GetMapping(path = "/getAdvanceSetting")
@ApiOperation("查询企业高级设置")
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(){
return ResponseResult.success();
@@ -253,8 +284,7 @@ public class DeskController {
@GetMapping(path = "/changeAdvanceSetting")
@ApiOperation("新增或者修改高级设置")
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody AdvancedSettingRequest advancedSettingRequest){
public ResponseResult<AdvancedSettingVO> getAdvanceSetting(@RequestBody AdvancedSettingRequest advancedSettingRequest){
return ResponseResult.success();

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
View File

@@ -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 {