From 2c50b237f88e5f40ceb44aef57b2117fcc3eaed5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 4 Jun 2025 17:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BA=97=E9=93=BA=E6=9F=90=E9=98=B6=E6=AE=B5=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/ShopService.java | 2 ++ .../cool/store/service/impl/ShopServiceImpl.java | 14 +++++++++++++- .../cool/store/controller/webb/DeskController.java | 3 ++- .../store/controller/webc/MiniShopController.java | 6 ++++++ 4 files changed, 23 insertions(+), 2 deletions(-) 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 5319f5279..63632a7cb 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 @@ -132,4 +132,6 @@ public interface ShopService { * @return */ List getSubStageHandle(Long shopId,Integer subStage); + + ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage); } 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 fd0e2c6d2..63123867b 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 @@ -781,7 +781,7 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_85: return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId()); - case SHOP_SUB_STAGE_STATUS_72: + // case SHOP_SUB_STAGE_STATUS_72: case SHOP_SUB_STAGE_STATUS_83: return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId()); @@ -860,6 +860,18 @@ public class ShopServiceImpl implements ShopService { } } + @Override + public ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage) { + if(shopId == null|| subStage == null ){ + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + ShopStageInfoDO stage = shopStageInfoDAO.getByShopIdAndSubStage(shopId, subStage); + if (stage!=null){ + return new ShopStageInfoVO(stage.getShopStage(), stage.getShopSubStage(), stage.getShopSubStageStatus(),stage.getIsTerminated()); + } + return null; + } + /** * 获取招商经理信息 * @param diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java index 8e73c9f51..a4c34f587 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java @@ -76,7 +76,8 @@ public class DeskController { @ApiOperation("待处理-支付加盟费保证金") @GetMapping("/payFranchiseFeesPendingList") public ResponseResult> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , + @RequestParam(value = "keyword") String keyword) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber, pageSize, userInfo,keyword)); } 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 389105b27..90c808b14 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 @@ -138,4 +138,10 @@ public class MiniShopController { return ResponseResult.success(shopService.getFranchiseBrandName(shopId)); } + @ApiOperation("获取店铺某阶段状态") + @GetMapping("/getShopStageStatus") + public ResponseResult getShopStageStatus(@RequestParam("shopId")Long shopId, @RequestParam("subStage")Integer subStage) { + return ResponseResult.success(shopService.getShopStageStatus(shopId, subStage)); + } + }