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())){