Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松
2025-12-03 11:48:49 +08:00

View File

@@ -137,10 +137,14 @@ public class AuthorizationServiceImpl implements AuthorizationService {
if (shopInfo == null) { if (shopInfo == null) {
throw new CzgException("商户不存在"); throw new CzgException("商户不存在");
} }
// 过期时间校验 if (shopInfo.getId() != 1) {
if (shopInfo.getExpireTime() != null) { // 过期时间校验
if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) { if (shopInfo.getExpireTime() != null) {
throw new CzgException("店铺已到期,请联系区域经理续费"); if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) {
throw new CzgException("店铺已到期,请联系区域经理续费");
}
} else {
throw new CzgException("店铺未激活");
} }
} }
boolean isAllowAccountLogin = shopBranchService.isAllowAccountLogin(shopInfo.getId()); boolean isAllowAccountLogin = shopBranchService.isAllowAccountLogin(shopInfo.getId());