From ee537c635a50b81824f82eb914609a5efd92e308 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 17 Apr 2024 19:25:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/PointTodoInfoDAO.java | 7 +++++++ .../java/com/cool/store/mapper/PointTodoInfoMapper.java | 7 +++++++ .../src/main/resources/mapper/PointTodoInfoMapper.xml | 5 +++++ .../com/cool/store/request/AddPointDetailRequest.java | 2 +- .../java/com/cool/store/request/MiniAddPointRequest.java | 2 +- .../main/java/com/cool/store/vo/point/PointDetailVO.java | 3 +++ .../main/java/com/cool/store/service/PointService.java | 2 +- .../com/cool/store/service/impl/PointServiceImpl.java | 8 ++++++-- .../com/cool/store/controller/webb/PointController.java | 5 +++-- .../cool/store/controller/webc/MiniShopController.java | 5 +++-- 10 files changed, 37 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java index 2755f131c..f72151e85 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java @@ -51,4 +51,11 @@ public class PointTodoInfoDAO { PageHelper.startPage(request.getPageNum(), request.getPageSize()); return pointTodoInfoMapper.getUserTodoList(request); } + + public Integer getCurNodeNoByPoint(Long pointId){ + if(Objects.isNull(pointId)){ + return null; + } + return pointTodoInfoMapper.getCurNodeNoByPoint(pointId); + } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java index c6543289a..aad4da78c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java @@ -56,4 +56,11 @@ public interface PointTodoInfoMapper extends Mapper { * @return */ Page getUserTodoList(@Param("request") PointTodoPageRequest request); + + /** + * 获取当前节点 + * @param pointId + * @return + */ + Integer getCurNodeNoByPoint(@Param("pointId") Long pointId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml index 6ab3ccf57..4e533c537 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml @@ -95,4 +95,9 @@ where a.handler_user_id = #{request.developmentManager} and a.status = 0 and a.deleted = 0 and b.deleted = 0 + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index 23ae75237..9b0e44bd0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -26,7 +26,7 @@ public class AddPointDetailRequest { @ApiModelProperty("详细地址") private String address; - @ApiModelProperty("经营状况") + @ApiModelProperty("经营状况 1营业中 2空铺") private Integer businessStatus; @ApiModelProperty("09:00-10:00人流量") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java index b5c35ba39..c66979255 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java @@ -27,7 +27,7 @@ public class MiniAddPointRequest { @ApiModelProperty("详细地址") private String address; - @ApiModelProperty("经营状况") + @ApiModelProperty("经营状况 1营业中 2空铺") private Integer businessStatus; @ApiModelProperty("使用面积(一楼)") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index c33417243..983a53613 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -230,6 +230,9 @@ public class PointDetailVO { @ApiModelProperty("图片对象") private String pictureObj; + @ApiModelProperty("当前节点") + private Integer curNodeNo; + public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) { PointDetailVO result = new PointDetailVO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java index 6a34ba4fb..8759bcf13 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java @@ -29,7 +29,7 @@ public interface PointService { * @param pointId * @return */ - PointDetailVO getPointDetailInfo(Long pointId); + PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo); /** * 更新铺位 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index e0f202784..0551825c3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -99,7 +99,7 @@ public class PointServiceImpl implements PointService { } @Override - public PointDetailVO getPointDetailInfo(Long pointId) { + public PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo) { PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); if(Objects.isNull(pointInfo)){ log.error("铺位基本信息不存在"); @@ -110,7 +110,11 @@ public class PointServiceImpl implements PointService { log.error("铺位详情信息不存在"); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } - return PointDetailVO.convertVO(pointInfo, pointDetailInfo); + PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo); + if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){ + result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId)); + } + return result; } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index f148a22bb..1b4cd80a0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -38,8 +38,9 @@ public class PointController { @ApiOperation("铺位详情") @GetMapping("/detail") - public ResponseResult getPointDetailInfo(@RequestParam("pointId")Long pointId) { - return ResponseResult.success(pointService.getPointDetailInfo(pointId)); + public ResponseResult getPointDetailInfo(@RequestParam("pointId")Long pointId, + @RequestParam(value = "isGetNodeNo", required = false)Boolean isGetNodeNo) { + return ResponseResult.success(pointService.getPointDetailInfo(pointId, isGetNodeNo)); } @ApiOperation("完善铺位") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index bc00c5a00..d154a1548 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -66,8 +66,9 @@ public class MiniShopController { @ApiOperation("铺位详情") @GetMapping("/detail") - public ResponseResult getPointDetailInfo(@RequestParam("pointId")Long pointId) { - return ResponseResult.success(pointService.getPointDetailInfo(pointId)); + public ResponseResult getPointDetailInfo(@RequestParam("pointId")Long pointId, + @RequestParam(value = "isGetNodeNo", required = false)Boolean isGetNodeNo) { + return ResponseResult.success(pointService.getPointDetailInfo(pointId, isGetNodeNo)); } @ApiOperation("选择铺位")