czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
张松
2025-12-03 11:48:49 +08:00
parent 9086e806d7 ad58d5f2e5
commit a02adbae3e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@@ -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());