From b9b6a90deea833a78c6628efc637df969137f57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Fri, 13 Dec 2024 13:28:50 +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

---
 .../system/cashierservice/service/LoginService.java        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index d80162d..a3c60a4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -1,6 +1,6 @@
 package com.chaozhanggui.system.cashierservice.service;
 
-import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.comparator.CompareUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
@@ -127,8 +127,7 @@ public class LoginService {
         if (shopInfo.getExpireAt() != null) {
             Long expireAt = shopInfo.getExpireAt();
             Date time = DateUtil.calendar(expireAt).getTime();
-            long expireDays = DateUtil.between(DateUtil.beginOfDay(new Date()), DateUtil.beginOfDay(time), DateUnit.DAY, false);
-            if (expireDays < 0) {
+            if (CompareUtil.compare(time, new Date()) < 0) {
                 return Result.fail("店铺已到期，请联系区域经理续费");
             }
         }
@@ -153,7 +152,7 @@ public class LoginService {
             if(shopInfo.getExpireAt() != null) {
                 Long expireAt = shopInfo.getExpireAt();
                 Date time = DateUtil.calendar(expireAt).getTime();
-                accountMap.put("expireDate", DateUtil.formatDate(time));
+                accountMap.put("expireDate", DateUtil.formatDateTime(time));
             }
         }
         accountMap.put("uuid", uuid);