From 4356655dfd3b2493f80301ee6cfebef6a6500462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 15 Jun 2023 11:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E5=91=98+=E7=8A=B6=E6=80=81=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/WorkflowStageEnum.java | 4 +- .../cool/store/enums/WorkflowStatusEnum.java | 15 ++-- .../com/cool/store/dao/HyPartnerClerkDAO.java | 34 +++++++++ .../store/mapper/HyPartnerClerkMapper.java | 5 ++ .../resources/mapper/HyPartnerClerkMapper.xml | 7 ++ .../store/service/HyPartnerClerkService.java | 25 +++++++ .../cool/store/service/OpenAreaService.java | 9 +++ .../service/impl/HyPartnerClerkImpl.java | 41 ++++++++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 2 +- .../HyPartnerInterviewPlanServiceImpl.java | 4 +- .../service/impl/OpenAreaServiceImpl.java | 53 ++++++++++++- .../store/controller/ClerkController.java | 41 ++++++++++ .../cool/store/controller/DeskController.java | 74 +++---------------- .../store/controller/OpenAreaController.java | 67 +++++++++++++++++ .../store/controller/OpenAreaController.java | 2 +- 15 files changed, 302 insertions(+), 81 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkImpl.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java index 79217d723..d21df697f 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java @@ -30,8 +30,8 @@ public enum WorkflowStageEnum { public static final HashMap getWorkflowStageMap(){ HashMap result = new HashMap<>(); result.put(INTENT.getCode(),WorkflowStatusEnum.INTENT_3.getCode()); - result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_6.getCode()); - result.put(INTERVIEW.getCode(),WorkflowStatusEnum.INTERVIEW_6.getCode()); + result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_7.getCode()); + result.put(INTERVIEW.getCode(),WorkflowStatusEnum.INTERVIEW_7.getCode()); return result; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java index e83971fdf..19979dd45 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java @@ -14,16 +14,17 @@ public enum WorkflowStatusEnum { //预约面试阶段 RESERVATION_0("0","待预约"), - RESERVATION_6("6","到期未预约"), + RESERVATION_1("1","待审核"), + RESERVATION_7("7","到期未预约"), //合格资格面试 - INTERVIEW_1("1","待面试"), - INTERVIEW_2("2","已开始"), - INTERVIEW_3("3","待审核"), - INTERVIEW_4("4","审核中"), - INTERVIEW_5("5","审核通过"), - INTERVIEW_6("6","拒绝"), + INTERVIEW_2("2","待面试"), + INTERVIEW_3("3","已开始"), + INTERVIEW_4("4","待审核"), + INTERVIEW_5("5","审核中"), + INTERVIEW_6("6","审核通过"), + INTERVIEW_7("7","拒绝"), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java new file mode 100644 index 000000000..5edcb6f2e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java @@ -0,0 +1,34 @@ +package com.cool.store.dao; + +import com.cool.store.entity.HyPartnerClerkDO; +import com.cool.store.mapper.HyPartnerClerkMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/15 10:09 + * @Version 1.0 + */ +@Repository +public class HyPartnerClerkDAO { + + @Resource + HyPartnerClerkMapper hyPartnerClerkMapper; + + public int insertSelective( HyPartnerClerkDO record){ + return hyPartnerClerkMapper.insertSelective(record); + } + + public int updateByPrimaryKeySelective(HyPartnerClerkDO record){ + return hyPartnerClerkMapper.updateByPrimaryKeySelective(record); + } + + public List getHyPartnerClerkList(Long lineId){ + return hyPartnerClerkMapper.getHyPartnerClerkList(lineId); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java index d428722d2..c463c7bce 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java @@ -3,6 +3,8 @@ package com.cool.store.mapper; import com.cool.store.entity.HyPartnerClerkDO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:51 @@ -22,4 +24,7 @@ public interface HyPartnerClerkMapper { * dateTime:2023-05-29 03:51 */ int updateByPrimaryKeySelective(@Param("record") HyPartnerClerkDO record); + + List getHyPartnerClerkList(@Param("lineId") Long lineId); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml index 3d8f19b42..508288dec 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml @@ -101,4 +101,11 @@ where id = #{record.id} + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java new file mode 100644 index 000000000..eeeddc963 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java @@ -0,0 +1,25 @@ +package com.cool.store.service; + +import com.cool.store.vo.PartnerClerkVO; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/15 11:05 + * @Version 1.0 + */ +public interface HyPartnerClerkService { + + + /** + * 通过线索ID查询店员信息 + * @param lineId + * @return + */ + List getPartnerClerkList(Long lineId); + + + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java index 21548368a..7f497aa28 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java @@ -24,6 +24,15 @@ public interface OpenAreaService { List queryByKeyword(String keyword,Boolean flag); + /** + * 查询所有的开放区域 城市树 + * @param keyword + * @param flag + * @return + */ + List queryAllOpenAreaByKeyword(String keyword,Boolean flag); + + /** * 查询字列表 * @param type diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkImpl.java new file mode 100644 index 000000000..26b945c7a --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkImpl.java @@ -0,0 +1,41 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.HyPartnerClerkDAO; +import com.cool.store.entity.HyPartnerClerkDO; +import com.cool.store.service.HyPartnerClerkService; +import com.cool.store.vo.PartnerClerkVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/15 11:05 + * @Version 1.0 + */ +@Service +public class HyPartnerClerkImpl implements HyPartnerClerkService { + + @Resource + HyPartnerClerkDAO hyPartnerClerkDAO; + + + @Override + public List getPartnerClerkList(Long lineId) { + List hyPartnerClerkList = hyPartnerClerkDAO.getHyPartnerClerkList(lineId); + List result= new ArrayList<>(); + hyPartnerClerkList.forEach(x->{ + PartnerClerkVO partnerClerkVO = new PartnerClerkVO(); + partnerClerkVO.setPartnerId(x.getPartnerId()); + partnerClerkVO.setPartnerLineId(x.getPartnerLineId()); + partnerClerkVO.setAge(x.getAge()); + partnerClerkVO.setChooseReason(x.getChooseReason()); + partnerClerkVO.setUsername(x.getUsername()); + partnerClerkVO.setRelationship(x.getRelationship()); + result.add(partnerClerkVO); + }); + return result; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index e2a8205b1..b3c43a44e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -50,7 +50,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic workflowStatus = WorkflowStatusEnum.RESERVATION_0.getCode(); } if (CommonConstants.FOLLOW.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); + workflowStatus = WorkflowStatusEnum.INTERVIEW_5.getCode(); } PageHelper.startPage(pageNumber,pageSize); PageInfo partnerIntentApplyInfo = hyPartnerIntentInfoDAO.selectPartnerIntentApplyInfoList(userId, WorkflowStageEnum.INTENT.getCode(), workflowStatus); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 22b878104..2e5a6e6f7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -84,10 +84,10 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan public PageInfo getQualifiedInterviewList(String userId, String type, Integer pageSize, Integer pageNumber) { String workflowStatus = ""; if (CommonConstants.PENDING.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTERVIEW_3.getCode(); + workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); } if (CommonConstants.FOLLOW.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); + workflowStatus = WorkflowStatusEnum.INTERVIEW_5.getCode(); } PageHelper.startPage(pageNumber,pageSize); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 3d3f25043..5fb5b549e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -12,13 +12,11 @@ import com.cool.store.vo.OpenAreaVO; import com.cool.store.vo.OpenProvinceVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -59,6 +57,53 @@ public class OpenAreaServiceImpl implements OpenAreaService { return openAreaTreeVOS; } + @Override + public List queryAllOpenAreaByKeyword(String keyword, Boolean flag) { + //先查出所有的一级菜单 + List openArea = hyOpenAreaInfoDAO.queryFirstLevel(); + Map longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); + + //查询关键字下所有的数据 原始的数据 + List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,flag); + + Map hyMap = hyOpenAreaInfoDOS.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); + + Set list = new HashSet(); + hyOpenAreaInfoDOS.stream().forEach(x->{ + Long parentId = x.getParentId(); + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(parentId); + if (hyOpenAreaInfoDO==null&&parentId!=null){ + //添加到集合中 + list.add(x.getParentId()); + } + }); + if (CollectionUtils.isNotEmpty(list)){ + //二级采单 + List hyOpenAreaInfoDOList = hyOpenAreaInfoDAO.queryByIdsExcludeFirstLevel(new ArrayList<>(list)); + hyOpenAreaInfoDOS.addAll(hyOpenAreaInfoDOList); + //如果二级采单是空 说明list全部是一级采单 + if (CollectionUtils.isEmpty(hyOpenAreaInfoDOList)){ + list.stream().forEach(x->{ + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(x); + if (hyOpenAreaInfoDO==null){ + hyOpenAreaInfoDOS.add(longHyOpenAreaInfoDOMap.get(x)); + } + }); + } + hyOpenAreaInfoDOList.stream().forEach(x->{ + Long parentId = x.getParentId(); + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(parentId); + if (hyOpenAreaInfoDO==null){ + HyOpenAreaInfoDO infoDO = longHyOpenAreaInfoDOMap.get(parentId); + hyOpenAreaInfoDOS.add(infoDO); + } + }); + } + JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(hyOpenAreaInfoDOS)), "id", "parentId","childNode" ); + List openAreaTreeVOS = JSONObject.parseArray(objects.toJSONString(), OpenAreaTreeVO.class); + return openAreaTreeVOS; + } + @Override public List getChildrenList(String type, Long parentId) { List childrenList = hyOpenAreaInfoDAO.getChildrenList(type, parentId); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java new file mode 100644 index 000000000..c2378f68b --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java @@ -0,0 +1,41 @@ +package com.cool.store.controller; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.HyPartnerClerkService; +import com.cool.store.vo.PartnerClerkVO; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/15 11:13 + * @Version 1.0 + */ +@RestController +@Slf4j +public class ClerkController { + + @Resource + HyPartnerClerkService hyPartnerClerkService; + + + @GetMapping(path = "/queryPartnerClerkInfoList") + @ApiOperation("根据线索ID 查询店员列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + }) + public ResponseResult> queryPartnerClerkInfoList(@RequestParam(value = "lineId",required = false)Long lineId){ + return ResponseResult.success(hyPartnerClerkService.getPartnerClerkList(lineId)); + } + + + +} 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 e8287818f..3fa03560e 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 @@ -1,5 +1,6 @@ package com.cool.store.controller; +import com.cool.store.context.CurrentUserHolder; import com.cool.store.enums.LineStatusEnum; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; @@ -35,15 +36,14 @@ public class DeskController { HyPartnerLineInfoService hyPartnerLineInfoService; @Resource HyPartnerBaseInfoService hyPartnerBaseInfoService; - @Resource - OpenAreaService openAreaService; + @GetMapping(path = "/interviewSchedule") @ApiOperation("面试日程信息 面试信息有限 不做分页") - public ResponseResult interviewSchedule(@RequestParam(value = "userId",required = false) String userId, - @RequestParam(value = "selectedData",required = false) Date selectedData){ + public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){ + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(deskService.interviewSchedule(userId,selectedData)); } @@ -60,10 +60,8 @@ public class DeskController { @GetMapping(path = "/queryInterviewPlan") @ApiOperation("是否有面试与临期线索") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "招商经理ID", required = false), - }) - public ResponseResult queryInterviewPlanVO(@RequestParam(value = "userId",required = false)String userId){ + public ResponseResult queryInterviewPlanVO(){ + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(deskService.getInterviewPlan(userId)); } @@ -78,7 +76,7 @@ public class DeskController { public ResponseResult> queryIntentApplyList(@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){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,type,pageSize,pageNumber)); } @@ -88,7 +86,7 @@ public class DeskController { public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,pageSize,pageNumber)); } @@ -100,7 +98,7 @@ public class DeskController { public ResponseResult> queryQualifiedInterviewList(@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){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(hyPartnerInterviewPlanService.getQualifiedInterviewList(userId,type,pageSize,pageNumber)); } @@ -158,7 +156,7 @@ public class DeskController { public ResponseResult> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(hyPartnerLineInfoService.lastMonthCloseLine(userId,pageSize,pageNumber)); } @@ -242,56 +240,4 @@ public class DeskController { return ResponseResult.success(hyPartnerBaseInfoService.addTags(addTagsRequest)); } - - // TODO: 2023/6/13 添加根据线索查询店员接口列表接口 -// @GetMapping(path = "/queryPartnerIntentApplyInfo") -// @ApiOperation("查看意向审核信息") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), -// }) -// public ResponseResult queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){ -// -// return ResponseResult.success(); -// } - - - - @GetMapping(path = "/getOpenAreaTree") - @ApiOperation("开放城市树-搜索城市") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false) - }) - public ResponseResult> getOpenAreaTree(@RequestParam(value = "keyWord",required = false)String keyWord){ - - return ResponseResult.success(openAreaService.queryByKeyword(keyWord,Boolean.TRUE)); - } - - - @GetMapping(path = "/getOpenAreaList") - @ApiOperation("开放城市树-子列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), - @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) - }) - public ResponseResult> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId, - @RequestParam(value = "type",required = false)String type){ - return ResponseResult.success(openAreaService.getChildrenList(type,parentId)); - } - - - - @PostMapping(path = "/changeOpenAreaStatus") - @ApiOperation("变更开放区域状态") - public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ - - String userId = ""; - return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); - } - - - - - - - } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java new file mode 100644 index 000000000..f9c1a7e09 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java @@ -0,0 +1,67 @@ +package com.cool.store.controller; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.request.OpenAreaRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OpenAreaService; +import com.cool.store.vo.OpenAreaTreeVO; +import com.cool.store.vo.OpenAreaVO; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +public class OpenAreaController { + + @Resource + OpenAreaService openAreaService; + + @GetMapping(path = "/getOpenAreaTree") + @ApiOperation("开放城市树-搜索城市 到第二节点") + @ApiImplicitParams({ + @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false) + }) + public ResponseResult> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){ + return ResponseResult.success(openAreaService.queryByKeyword(keyword,Boolean.TRUE)); + } + + + @GetMapping(path = "/getAllOpenAreaTree") + @ApiOperation("开放城市树-所有节点") + @ApiImplicitParams({ + @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false) + }) + public ResponseResult> getAllOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){ + return ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,Boolean.FALSE)); + } + + + @GetMapping(path = "/getOpenAreaList") + @ApiOperation("开放城市树-子列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), + @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) + }) + public ResponseResult> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId, + @RequestParam(value = "type",required = false)String type){ + return ResponseResult.success(openAreaService.getChildrenList(type,parentId)); + } + + + + @PostMapping(path = "/changeOpenAreaStatus") + @ApiOperation("变更开放区域状态") + public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ + String userId = CurrentUserHolder.getUserId(); + return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); + } +} 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 eee62096c..5090d56c5 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 @@ -51,7 +51,7 @@ public class OpenAreaController { @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false), }) public ResponseResult> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword){ - List openAreaTreeVOS = openAreaService.queryByKeyword(keyword,Boolean.FALSE); + List openAreaTreeVOS = openAreaService.queryAllOpenAreaByKeyword(keyword,Boolean.FALSE); return ResponseResult.success(openAreaTreeVOS); }