From 4f4cf2b928764792c1f1914558c10eb96a8d03e9 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Thu, 19 Mar 2026 16:44:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=A3=E7=A0=81merge=20?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index aac20a9d5..c54f06dc7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -448,12 +448,12 @@ public class ShopServiceImpl implements ShopService { throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + String oldShopCode = shopInfo.getShopCode(); //0-不是使用标准店型 if (shopInfo.getUseStandardStore()==0){ //新增校验 缴费阶段之后 不能修改加盟模式 ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); //缴费阶段之后 加盟模式不能切换为直营店 直营店也不能切换为其他店 - String oldShopCode = shopInfo.getShopCode(); if (shopSubStageInfo.getShopSubStageStatus()>ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()){ if (request.getJoinMode()!=shopInfo.getJoinMode()&& (request.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode()||shopInfo.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode())){