diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 63c045250..df4a37d79 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -137,10 +137,14 @@ public class AuthorizationServiceImpl implements AuthorizationService { if (shopInfo == null) { throw new CzgException("商户不存在"); } - // 过期时间校验 - if (shopInfo.getExpireTime() != null) { - if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) { - throw new CzgException("店铺已到期,请联系区域经理续费"); + if (shopInfo.getId() != 1) { + // 过期时间校验 + if (shopInfo.getExpireTime() != null) { + if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) { + throw new CzgException("店铺已到期,请联系区域经理续费"); + } + } else { + throw new CzgException("店铺未激活"); } } boolean isAllowAccountLogin = shopBranchService.isAllowAccountLogin(shopInfo.getId());