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