diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java index c8b70a6ef..e55a9058f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java @@ -43,6 +43,6 @@ public interface CoolStoreStartFlowService { * @Date: 2024/4/25 * @description:获取订货金 */ - ResponseResult getFirstOrder(String shopCode); + Boolean getFirstOrder(String shopCode); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java index 84be328b7..eba7271d1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java @@ -130,7 +130,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService } @Override - public ResponseResult getFirstOrder(String shopCode) { + public Boolean getFirstOrder(String shopCode) { log.info("getFirstOrder shopCode:{}", shopCode); if (Objects.isNull(shopCode)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -139,11 +139,8 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService String url = xfsgUrl + Constants.FRANCHISEE_STORE_NUM + "?storeCode=" + shopCode; JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>()); log.info("get url:{},jsonObject:{}", url, jsonObject); - String string = jsonObject.getString("data"); - if (string == null) { - throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); - } - return ResponseResult.success(string); + Boolean flag = (Boolean) jsonObject.get("data"); + return flag; } catch (Exception e) { log.error("获取鲜丰订货金异常", e); throw new ServiceException(ErrorCodeEnum. GET_FIRST_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/OpenPreparationController.java index 871c4b06f..7a855ab33 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/OpenPreparationController.java @@ -58,38 +58,26 @@ public class OpenPreparationController { private OpeningOperationPlanAuditService openingOperationPlanAuditService; @GetMapping("/flush") - public ResponseResult flush(@RequestParam("shopId") Long shopId) { - ShopStageInfoDO planStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_14); - log.info("flush shopStageInfo:{}", planStageInfo); + public ResponseResult flush(@RequestParam("shopId") Long shopId) { ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); try { - if (!orderStageInfo.getShopSubStageStatus(). - equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())) { + if (orderStageInfo.getShopSubStageStatus(). + equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) { ShopInfoDO shopInfo = shopService.getShopInfo(shopId); String shopCode = shopInfo.getShopCode(); - String data = coolStoreStartFlowService.getFirstOrder(shopCode).getData().toString(); - log.info("saveOrder,data:{}", data); - if (data == null) { - throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); - } - if (data.equals("true")) { + Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + log.info("saveOrder,flag:{}", firstOrder); + if (firstOrder) { //更改子阶段状态 shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); preparationService.whetherToOpenForAcceptance(shopId); } } - } catch (Exception e) { log.error("获取鲜丰订货金异常", e); } - ShopStageInfoDO firstOrderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); - log.info("flush orderStageInfo:{}", orderStageInfo); - OpenPreparationFlushVO flushVO = new OpenPreparationFlushVO(); - flushVO.setShopId(shopId); - flushVO.setOpenPlanState(planStageInfo.getShopSubStageStatus()); - flushVO.setFirstOderState(firstOrderStageInfo.getShopSubStageStatus()); - return ResponseResult.success(flushVO); + return ResponseResult.success(Boolean.TRUE); } @PostMapping("/openingOperationPlan/submit")