From de2b277deca6440098e837b9d52f61190a174fb1 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 11 May 2024 14:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=B2=9C?= =?UTF-8?q?=E4=B8=B0=E8=AE=A2=E8=B4=A7=E9=87=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/OpeningOperationPlanService.java | 1 + .../service/impl/OpeningOperationPlanImpl.java | 16 +++++++++++++++- .../webb/PCOpenPreparationController.java | 7 ++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpeningOperationPlanService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpeningOperationPlanService.java index cf435b393..219b9bab2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpeningOperationPlanService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpeningOperationPlanService.java @@ -32,4 +32,5 @@ public interface OpeningOperationPlanService { */ PageInfo getPlanListPage(PlanListRequest request); Boolean flush(Long shopId); + Boolean getStatus(Long shopId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 1aaf7cc68..458e25ca3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -197,7 +197,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { public Boolean flush(Long shopId) { ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); try { - if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus(). + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus(). equals(orderStageInfo.getShopSubStageStatus())) { ShopInfoDO shopInfo = shopService.getShopInfo(shopId); String shopCode = shopInfo.getShopCode(); @@ -218,5 +218,19 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { } + @Override + public Boolean getStatus(Long shopId) { + try{ + ShopInfoDO shopInfo = shopService.getShopInfo(shopId); + String shopCode = shopInfo.getShopCode(); + Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + return firstOrder; + }catch (Exception e){ + log.error("获取鲜丰订货金异常或更新状态失败"); + throw new ServiceException(ErrorCodeEnum.YLF_ERROR); + } + + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java index 3f4e186f9..b2b33dbe9 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java @@ -18,6 +18,7 @@ import com.cool.store.response.ResponseResult; import com.cool.store.service.*; import com.cool.store.vo.OpeningOperationPlanListVO; import com.cool.store.vo.OpeningOperationPlanVO; +import com.cool.store.vo.shop.ShopStageInfoVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -52,7 +53,11 @@ public class PCOpenPreparationController { public ResponseResult flush(@RequestParam("shopId") Long shopId) { return ResponseResult.success(openingOperationPlanService.flush(shopId)); } - + @ApiOperation("获取鲜丰订货金状态") + @GetMapping("/getStatus") + public ResponseResult getStatus(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(openingOperationPlanService.getStatus(shopId)); + } @PostMapping("/openingOperationPlan/submit") @ApiOperation("提交开业运营方案") public ResponseResult submitPlan(@RequestBody OpeningOperationPlanRequest request) {