From b592d793f2bd593d526a02b1167ecda61143fe14 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 13:52:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BB=BA=E5=BA=97=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E9=98=B6=E6=AE=B5=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderSysInfoServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 34cce643a..c4d0d62bb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -254,28 +254,30 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { //回退 return shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_152); } + //测量阶段 + ShopStageInfoDO measurementStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8_6); if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果不是毛泽军下级大区 直接完成不用总裁审批 if (!flag && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { - - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) + && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); stageCompletion(request.getShopId()); syncMainSysServer.syncStore(request.getShopId()); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); return CommonConstants.ONE; } else { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)) { - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) + && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } stageCompletion(request.getShopId()); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); syncMainSysServer.syncStore(request.getShopId()); } return CommonConstants.ONE;