From 879db971ea4d6ce8df239f0b0bca4922daf52121 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Mar 2025 15:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=8C=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=8A=B6=E6=80=81=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/ShopStageInfoDAO.java | 7 +++ .../store/mapper/ShopStageInfoMapper.java | 3 ++ .../main/resources/mapper/LineInfoMapper.xml | 2 +- .../mapper/OpeningOperationPlanMapper.xml | 2 +- .../resources/mapper/OperationLogMapper.xml | 12 ++--- .../main/resources/mapper/ShopInfoMapper.xml | 6 ++- .../resources/mapper/ShopStageInfoMapper.xml | 13 ++++-- .../com/cool/store/service/ShopService.java | 2 +- .../store/service/impl/ShopServiceImpl.java | 44 +++++++++++++------ .../controller/webb/PCShopController.java | 9 ++-- 10 files changed, 71 insertions(+), 29 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 8f9f228c2..a0286a629 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -128,6 +128,13 @@ public class ShopStageInfoDAO { return shopStageInfoMapper.getAllCompletionCount(shopId); } + public Integer getCompletionCount(Long shopId) { + if (Objects.isNull(shopId)) { + return 0; + } + return shopStageInfoMapper.getCompletionCount(shopId); + } + /** * @Auther: wangshuo * @Date: 2024/5/3 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 2f867c5dd..770a99a4a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -46,6 +46,9 @@ public interface ShopStageInfoMapper extends Mapper { */ Integer getAllCompletionCount(@Param("shopId") Long shopId); + + Integer getCompletionCount(@Param("shopId") Long shopId); + /** * 跟新店铺阶段信息 * @param shopId diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index f4a72ffc4..9ca17eca3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -480,7 +480,7 @@ left join xfsg_open_area_info b on a.want_shop_area_id = b.id - where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) + where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) and c.deleted = 0 and (a.investment_manager = #{userId} or c.investment_manager = #{userId} ) diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml index 02f951f92..0ef252f8b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml @@ -51,7 +51,7 @@ op.result_type AS resultType,si.supervisor_user_id as supervisorUserId from xfsg_opening_operation_plan op join xfsg_shop_info si on si.id = op.shop_id - where 1=1 + where si.deleted = 0 AND si.shop_name like concat('%', #{request.shopName}, '%') diff --git a/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml index 9da42e0f6..6394fa4b4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml @@ -79,15 +79,17 @@ + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 47afbd64b..df79a9a9f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -95,7 +95,7 @@ public interface ShopService { * @return */ Boolean shopClose(Long shopId); - + Boolean updateShopStatue(Long shopId); /** * 分店列表 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 8b9017a51..6188df4d9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -193,22 +193,22 @@ public class ShopServiceImpl implements ShopService { @Override public Integer deleteShop(DeleteShopRequest request) { - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); - if (Objects.nonNull(shopInfo)) { - //进入选址不允许删除操作 - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } -// ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_3); -// if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ +// ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); +// if (Objects.nonNull(shopInfo)) { +// //进入选址不允许删除操作 // throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); // } - if (Objects.nonNull(shopInfo.getPointId())) { - PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); - if (Objects.nonNull(pointInfo) && SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) { - pointInfoDAO.recyclePoint(pointInfo.getId()); - } - pointRecommendDAO.updateRecommendStatus(shopInfo.getPointId(), PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1, Arrays.asList(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_5)); - } +// ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_3); +// if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ +// throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); +// } +// if (Objects.nonNull(shopInfo.getPointId())) { +// PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); +// if (Objects.nonNull(pointInfo) && SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) { +// pointInfoDAO.recyclePoint(pointInfo.getId()); +// } +// pointRecommendDAO.updateRecommendStatus(shopInfo.getPointId(), PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1, Arrays.asList(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_5)); +// } ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(request.getShopId()); updateShop.setDeleted(true); @@ -410,6 +410,22 @@ public class ShopServiceImpl implements ShopService { return Boolean.TRUE; } + @Override + public Boolean updateShopStatue(Long shopId) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + if (Objects.isNull(shopInfo)) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + Integer completionCount = shopStageInfoDAO.getCompletionCount(shopId); + if (completionCount.equals(ShopSubStageEnum.values().length)) { + shopInfo.setShopStatus(ShopStatusEnum.DONE.getCode()); + } else { + shopInfo.setShopStatus(ShopStatusEnum.ING.getCode()); + } + shopInfoDAO.updateShopInfo(shopInfo); + return Boolean.TRUE; + } + @Override public PageInfo getBranchShopList(BranchShopRequest request, String userId) { if (request.getFlag().equals(CommonConstants.TWO)) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index 1332e6d7d..d69259916 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -117,12 +117,15 @@ public class PCShopController { return ResponseResult.success(transferLogService.getTransferLogPage(pageNum, pageSize, lineId, lineShopType)); } - - - @ApiOperation("门店结束跟进") @GetMapping("/shopClose") public ResponseResult shopClose(@RequestParam("shopId")Long shopId) { return ResponseResult.success(shopService.shopClose(shopId)); } + + @ApiOperation("门店恢复状态") + @GetMapping("/updateShopStatue") + public ResponseResult updateShopStatue(@RequestParam("shopId")Long shopId) { + return ResponseResult.success(shopService.updateShopStatue(shopId)); + } }