From 542fd9ad233f38e590d4d183f6ccd892ffa7a6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 26 Jun 2024 09:32:38 +0800 Subject: [PATCH] bugfix --- .../com/cool/store/service/impl/DecorationServiceImpl.java | 4 ++-- .../com/cool/store/service/impl/PreparationServiceImpl.java | 2 +- .../com/cool/store/controller/webb/PreparationController.java | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index b842bd0d6..0fcc71f05 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -532,8 +532,8 @@ public class DecorationServiceImpl implements DecorationService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //必须是待提交状态才能提交 - ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()); - if (Objects.isNull(shopStageInfo)) { + ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); + if (shopStageInfo!=null&&ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index dda260d50..b681c831f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -182,7 +182,7 @@ public class PreparationServiceImpl implements PreparationService { if (preparationProcess == null){ return null; } - preparationProcess.setTotalCount(14); + preparationProcess.setTotalCount(11); return preparationProcess; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java index e180e1e2a..ec3744f74 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java @@ -46,7 +46,6 @@ public class PreparationController { return ResponseResult.success(preparationService.getPreparationDetail(shopId)); } - @ApiOperation("筹建进展") @GetMapping("/getPreparationProcess") public ResponseResult getPreparationProcess(@RequestParam("shopId")Long shopId) {