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 daac66788..4b1bdc0a8 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 @@ -316,6 +316,7 @@ public enum ErrorCodeEnum { NOT_FLAGSHIP_STORE_NOT_EXIST(1610011,"当前阶段加盟类型不能变更!",null), JOIN_MODE_NOT_ALLOW_OPERATE(1610012,"加盟部人员只能新建加盟店或联营店,请确认!",null), STORE_NOT_FIND(1610013,"门店不存在",null), + SHOP_NAME_INVALID(1610014, "门店名称包含禁止关键词",null), //装修 TEAM_USED(1612001,"该装修团队有门店使用,无法删除,请确认!",null), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index bec865579..4269282ed 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -52,7 +52,10 @@ public class ShopInfoDAO { if(CollectionUtils.isEmpty(shopInfoList)){ return CommonConstants.ZERO; } - shopInfoList.forEach(v -> v.setStoreId(UUIDUtils.get32UUID())); + for (ShopInfoDO shopInfo : shopInfoList) { + validateShopName(shopInfo.getShopName()); + shopInfo.setStoreId(UUIDUtils.get32UUID()); + } return shopInfoMapper.batchAddShop(shopInfoList); } @@ -112,6 +115,7 @@ public class ShopInfoDAO { * @return */ public Long addShopInfo(ShopInfoDO shopInfo){ + validateShopName(shopInfo.getShopName()); shopInfo.setStoreId(UUIDUtils.get32UUID()); shopInfoMapper.insertSelective(shopInfo); return shopInfo.getId(); @@ -122,6 +126,7 @@ public class ShopInfoDAO { log.info("店铺为空 或者店铺id为空"); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } + validateShopName(shopInfo.getShopName()); return shopInfoMapper.updateByPrimaryKeySelective(shopInfo); } @@ -377,4 +382,14 @@ public class ShopInfoDAO { public List getPushHqtShopList(){ return shopInfoMapper.getPushHqtShopList(); } + + /** + * 校验名称 不能包含旗舰二字 + * @param shopName + */ + private void validateShopName(String shopName) { + if (StringUtils.isNotBlank(shopName) && shopName.contains("旗舰")) { + throw new ServiceException(ErrorCodeEnum.SHOP_NAME_INVALID); + } + } }