diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 094a03399..7f605c6a7 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -324,7 +324,7 @@ public enum ErrorCodeEnum { JOIN_MODE_NOT_ALLOW_OPERATE(1610012,"加盟部人员只能新建加盟店或联营店,请确认!",null), STORE_NOT_FIND(1610013,"门店不存在",null), SHOP_NAME_INVALID(1610014, "门店名称包含禁止关键词",null), - CONTRACT_STAGE_NO_COMPLETE(1610015, "合同签约阶段未完成,无法分配运营顾问!",null), + CONTRACT_STAGE_NO_COMPLETE(1610015, "当前阶段无法分配运营顾问!",null), //装修 TEAM_USED(1612001,"该装修团队有门店使用,无法删除,请确认!",null), CURRENT_BRAND_SORT_NUMBER_EXIST(16100007,"当前品牌已存在该排序数字!",null), 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 071d3c032..110a65e1f 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 @@ -48,6 +48,7 @@ import java.util.stream.Stream; import static com.cool.store.enums.ErrorCodeEnum.*; import static com.cool.store.enums.UserRoleEnum.*; import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; +import static com.cool.store.enums.point.ShopSubStageEnum.SHOP_STAGE_15; import static com.cool.store.enums.point.ShopSubStageEnum.SHOP_STAGE_8; /** @@ -498,9 +499,9 @@ public class ShopServiceImpl implements ShopService { throw new ServiceException(PARAMS_VALIDATE_ERROR); } log.info("updateOperationsConsultant shopId:{},operationsConsultant:{}",shopId,operationsConsultant); - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, SHOP_STAGE_8); - //缴费阶段未完成 不能分配运营顾问 - if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, SHOP_STAGE_15); + //分配运营顾问之后 可以修改 也就是阶段是建店开始之后就可以修改 + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ throw new ServiceException(CONTRACT_STAGE_NO_COMPLETE); } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);