czg_team/cashier-client
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:
张松
2024-12-16 09:33:06 +08:00
parent 9543878cd1 0c6c96eacb
commit 1212fc1cc0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

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