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:
俞扬
2023-06-19 01:52:21 +08:00
parent 4283a6d65d fa26330573
commit 3bf26f70e8
29 changed files with 208 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -78,7 +78,7 @@ public class TokenValidateFilter implements Filter {
String userStr = "";
LoginUserInfo currentUser = null;
boolean isInWhiteList = excludePath(uri);
String accessToken = reqs.getHeader("accessToken");
String accessToken = "1cd17699b7dc1f64161485c2d365e0e0";
String key = "access_token:" + accessToken;
if(StringUtils.isNotBlank(accessToken)){
userStr = redisUtilPool.getString(key);

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

@@ -1,6 +1,7 @@
package com.cool.store.controller;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.calendar.UserCalendarsEventDTO;
import com.cool.store.enums.LineStatusEnum;
import com.cool.store.exception.ApiException;
@@ -43,6 +44,8 @@ public class DeskController {
private ISVHttpRequest isvHttpRequest;
@Resource
EnterpriseUserService enterpriseUserService;
@Resource
PartnerUserInfoService partnerUserInfoService;
@GetMapping(path = "/interviewSchedule")
@@ -68,7 +71,7 @@ public class DeskController {
@GetMapping(path = "/getUserCalendarsEvents")
@ApiOperation("飞书日程信息")
public ResponseResult<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam(value = "startTime",required = true) Long startTime,
@RequestParam(value = "endTime",required = true) Long endTime) throws ApiException {
@RequestParam(value = "endTime",required = true) Long endTime) throws ApiException {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime));
@@ -79,7 +82,7 @@ public class DeskController {
@GetMapping(path = "/queryStageCount")
@ApiOperation("招商经理视角====各阶段待处理待跟进数量")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false),
@ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false),
})
public ResponseResult<StageCountVO> queryStageCount(@RequestParam(value = "type",required = false)String type){
return ResponseResult.success(deskService.getStageCountByType(CurrentUserHolder.getUserId(),type));
@@ -93,10 +96,10 @@ public class DeskController {
}
@PostMapping(path = "/queryIntentApplyList")
@GetMapping(path = "/queryIntentApplyList")
@ApiOperation("招商经理视角===意向申请审核列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false),
@ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false),
@ApiImplicitParam(name = "pageNumber", value = "1", required = false),
@ApiImplicitParam(name = "pageSize", value = "10", required = false),
})
@@ -108,7 +111,7 @@ public class DeskController {
}
@PostMapping(path = "/querySubscribeInterviewTimeList")
@GetMapping(path = "/querySubscribeInterviewTimeList")
@ApiOperation("招商经理视角===预约面试时间 列表")
public ResponseResult<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)String type,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@@ -118,10 +121,10 @@ public class DeskController {
return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,type,pageSize,pageNumber));
}
@PostMapping(path = "/queryQualifiedInterviewList")
@GetMapping(path = "/queryQualifiedInterviewList")
@ApiOperation("招商经理视角===合格资格面试 列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false),
@ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false),
})
public ResponseResult<PageInfo<PartnerInterviewInfoVO>> queryQualifiedInterviewList(@RequestParam(value = "type",required = false)String type,
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@@ -156,10 +159,8 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
})
public ResponseResult<InviteCodeDetailVO> getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
public ResponseResult<InviteCodeDetailVO> getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)String partnerId){
return ResponseResult.success(partnerUserInfoService.selectInviteCodeDetail(partnerId));
}
@@ -168,10 +169,8 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
})
public ResponseResult<List<LineFollowHistoryVO>> getFollowHistory(@RequestParam(value = "partnerId",required = false)Long partnerId){
return ResponseResult.success();
public ResponseResult<List<LineFollowHistoryVO>> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId){
return ResponseResult.success(hyPartnerLineInfoService.getLineFollowHistory(partnerId));
}
@@ -207,8 +206,7 @@ public class DeskController {
@PostMapping(path = "/queryPublicSeqLineList")
@ApiOperation("公海列表")
public ResponseResult<PageInfo<PublicSeaLineListVo>> queryPublicSeaLineList(@RequestBody LineRequest LineRequest){
return ResponseResult.success();
return ResponseResult.success(hyPartnerLineInfoService.publicSeaLineList(CurrentUserHolder.getUserId(),LineRequest));
}
@@ -248,6 +246,23 @@ public class DeskController {
return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(CurrentUserHolder.getUserId(),closeFollowRequest));
}
@GetMapping(path = "/queryPartnerBaseInfo")
@ApiOperation("查看意向申请书——用户基本信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerBaseInfoVO> queryPartnerBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){
PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
return ResponseResult.success(hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), lineId));
}
@PostMapping(path = "/updatePartnerIntentInfo")
@ApiOperation("修改加盟商意向信息/行业认知")
public ResponseResult<Boolean> updatePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest));
}
@PostMapping(path = "/changeIntentInfo")
@ApiOperation("员工端变更C端用户意向信息")
public ResponseResult<Boolean> changeIntentInfo( @RequestBody BaseUserInfoRequest baseUserInfoRequest){

8
coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java
View File

@@ -28,10 +28,12 @@ public class OpenAreaController {
@GetMapping(path = "/getOpenAreaTree")
@ApiOperation("开放城市树-搜索城市 到第二节点")
@ApiImplicitParams({
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false),
@ApiImplicitParam(name = "areaStatus", value = "状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和", required = false)
})
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){
return ResponseResult.success(openAreaService.queryByKeyword(keyword,Boolean.TRUE));
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword,
@RequestParam(value = "areaStatus",required = false)String areaStatus){
return ResponseResult.success(openAreaService.queryByKeyword(keyword,areaStatus,Boolean.TRUE));
}