suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：代码merge 错误处理

Browse Source
This commit is contained in:
suzhuhong
2026-03-19 16:44:58 +08:00
parent 6bfab2c802
commit 4f4cf2b928
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -448,12 +448,12 @@ public class ShopServiceImpl implements ShopService {
throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST);
} }
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
String oldShopCode = shopInfo.getShopCode();
//0-不是使用标准店型 //0-不是使用标准店型
if (shopInfo.getUseStandardStore()==0){ if (shopInfo.getUseStandardStore()==0){
//新增校验 缴费阶段之后 不能修改加盟模式 //新增校验 缴费阶段之后 不能修改加盟模式
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); 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 (shopSubStageInfo.getShopSubStageStatus()>ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()){
if (request.getJoinMode()!=shopInfo.getJoinMode()&& if (request.getJoinMode()!=shopInfo.getJoinMode()&&
(request.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode()||shopInfo.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode())){ (request.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode()||shopInfo.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode())){