From 51adc16ecc9083d1f4fe7384bd4a8db64b9d34ea Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 7 May 2024 14:27:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=B4=A7=E9=87=91bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/FirstOrderService.java | 2 +- .../service/impl/FirstOrderServiceImp.java | 37 ++----------------- ....java => PCOpenPreparationController.java} | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) rename coolstore-partner-web/src/main/java/com/cool/store/controller/webb/{OpenPreparationController.java => PCOpenPreparationController.java} (98%) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 76915fe5f..1d17e0700 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -184,6 +184,7 @@ public enum ErrorCodeEnum { UPDATE_SHOP_SUB_STAGE_STATUS_FALSE(103009,"修改开业运营方案阶段状态失败",null), SHOP_ID_NOT_EXIST(103010,"shopId不存在",null), FIRST_ORDER_PARAM_NULL(103020,"首批订货金参数为空",null), + USER_NOT_LOGIN(103021,"用户未登录",null), XFSG_SERVICE_ERROR(103099,"鲜丰服务调用失败",null), GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java index b1be0354d..223d5dd68 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java @@ -16,5 +16,5 @@ public interface FirstOrderService { Integer saveOrder(FirstOrderRequest request, LoginUserInfo user); FirstOrderDTO getOrder(Long shopId); - FirstOrderDTO flush(Long shopId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 969abde63..959b7055c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -79,11 +79,9 @@ public class FirstOrderServiceImp implements FirstOrderService { //云立方同步 if (num > 0) { try { - // ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); - // String shopCode = shopInfo.getShopInfopCode(); -// String shopCode = "31310383"; -// Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); - Boolean flag = Boolean.TRUE; + ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); + String storeNum = shopInfo.getStoreNum(); + Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum); log.info("saveOrder,flag:{}", flag); if (flag == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); @@ -105,7 +103,7 @@ public class FirstOrderServiceImp implements FirstOrderService { public FirstOrderDTO getOrder(Long shopId) { log.info("getOrder shopId:{},", shopId); if (shopId == null) { - log.error("shopId/shopCode is null"); + log.error("shopId is null"); throw new ServiceException(ErrorCodeEnum.FIRST_ORDER_PARAM_NULL); } FirstOrderDTO order = firstOrderDAO.selectFirstOrderByShopId(shopId); @@ -114,31 +112,4 @@ public class FirstOrderServiceImp implements FirstOrderService { order.setFirstOrderSubStage(firstOrderStageInfo.getShopSubStageStatus()); return order; } - - @Override - public FirstOrderDTO flush(Long shopId) { - ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); - try { - if (!orderStageInfo.getShopSubStageStatus(). - equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())) { - ShopInfoDO shopInfo = shopService.getShopInfo(shopId); - String shopCode = shopInfo.getShopCode(); - Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); - log.info("saveOrder,flag:{}", flag); - if (flag == null) { - throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); - } - if (flag) { - //更改子阶段状态 - shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); - preparationService.whetherToOpenForAcceptance(shopId); - } - } - } catch (Exception e) { - log.error("获取鲜丰订货金异常", e); - } - FirstOrderDTO order = getOrder(shopId); - return order; - } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java similarity index 98% rename from coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java index 7615781bb..5b6031e90 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java @@ -39,7 +39,7 @@ import java.util.List; @RequestMapping("/pc/openPreparation") @Api(tags = "pc开业筹备") @Slf4j -public class OpenPreparationController { +public class PCOpenPreparationController { @Resource private FirstOrderService firstOrderService;