From 38d1bebf66c08b03654c9fce076edfe77778a178 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 25 Jul 2025 17:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BF=87=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/OrderSysInfoServiceImpl.java | 10 +++++++--- .../store/service/impl/SignFranchiseServiceImpl.java | 10 ++++++++-- 2 files changed, 15 insertions(+), 5 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 f0952e1c8..b47c0f3aa 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 @@ -251,9 +251,11 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果不是毛泽军下级大区 直接完成不用总裁审批 if (!flag && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { - updateDecorationStage(request.getShopId()); + + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + } shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); stageCompletion(request.getShopId()); syncMainSysServer.syncStore(request.getShopId()); hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); @@ -262,7 +264,9 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } else { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)) { - updateDecorationStage(request.getShopId()); + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + } stageCompletion(request.getShopId()); hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index df02cdbb8..0d4fd1023 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -343,9 +343,17 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //10s过期 acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); if (Boolean.TRUE.equals(acquired)) { + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); ShopSubStageStatusEnum shopSubStageStatusEnum = null; if (request.getAuditResult() == 1) { shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84; + if (shopInfoDO.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + //老店新开时装修与开业直接完成 + shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( + SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 + )); + + } } else if (request.getAuditResult() == 0) { shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85; } @@ -359,7 +367,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); shopAuditInfoDO.setRejectReason(request.getCause()); Map requestMap = new HashMap<>(); - ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum); Set auditFranchiseFeeUsers = new HashSet<>(); @@ -382,7 +389,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); - ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); //更新状态为加盟商 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); //暂时去掉