czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录返回店铺授权过期日期

Browse Source
This commit is contained in:
谭凯凯
2024-12-13 13:28:27 +08:00
committed by Tankaikai
parent ef68c1f5d9
commit 22f6c253a0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
View File

@@ -1,6 +1,7 @@
package cn.ysk.cashier.config.security.rest;
import cn.hutool.core.comparator.CompareUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
@@ -169,8 +170,8 @@ public class AuthorizationController {
if (shopInfo != null && shopInfo.getExpireAt() != null) {
Long expireAt = shopInfo.getExpireAt();
Date time = DateUtil.calendar(expireAt).getTime();
authInfo.put("expireDate", DateUtil.formatDate(time));
if (DateUtil.compare(new Date(), time) > 0) {
authInfo.put("expireDate", DateUtil.formatDateTime(time));
if (CompareUtil.compare(time, new Date()) < 0) {
throw new BadRequestException("店铺已到期，请联系区域经理续费");
}
}
@@ -248,8 +249,8 @@ public class AuthorizationController {
if (shopInfo != null && shopInfo.getExpireAt() != null) {
Long expireAt = shopInfo.getExpireAt();
Date time = DateUtil.calendar(expireAt).getTime();
authInfo.put("expireDate", DateUtil.formatDate(time));
if (DateUtil.compare(new Date(), time) > 0) {
authInfo.put("expireDate", DateUtil.formatDateTime(time));
if (DateUtil.compare(time, new Date()) > 0) {
throw new BadRequestException("店铺已到期，请联系区域经理续费");
}
}
@@ -298,5 +299,4 @@ public class AuthorizationController {
onlineUserService.logout(tokenProvider.getToken(request));
return new ResponseEntity<>(HttpStatus.OK);
}
}