From 22f6c253a0e9f15010d862578bc54aac0c66e3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Fri, 13 Dec 2024 13:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=8E=88=E6=9D=83=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/security/rest/AuthorizationController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java index 8a7e1f2a..b8812f90 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java @@ -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); } - }