diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java index c873448f..f260c4c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java @@ -173,9 +173,9 @@ public class ApiController extends BaseController { // TODO 增加返回连续上香天数 测算时间 ajax.put(Constants.TOKEN, token); - System.out.println(sysUser.getUserId()); +// System.out.println(sysUser.getUserId()); SysSignIn sysSignIn = sysSignInService.selectSysSignInByUId(sysUser.getUserId()); - System.out.println(sysSignIn); +// System.out.println(sysSignIn); sysSignInService.loginVerificationInformation(sysSignIn); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSignInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSignInServiceImpl.java index 4448c79b..022f26d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSignInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSignInServiceImpl.java @@ -147,12 +147,16 @@ public class SysSignInServiceImpl implements ISysSignInService { public void loginVerificationInformation(SysSignIn sysSignIn) { // 获取对应账户的 签到vip信息 Date vipStopTime = sysSignIn.getVipStopTime(); - // 登录时判断昨天是否上香 ,若无则更新上香天数为0 + // 登录时判断昨天是否上香 ,若无则更新上香天数为0,这里会导致今天签到过了,再登录就不是昨天了。。 + boolean yesterday = DateUtils.isYesterday(sysSignIn.getSignUpdateTime()); - if (!yesterday) { + //------------------------20241014修改判断连续签到时间------------- + boolean today = DateUtils.isToday(sysSignIn.getSignUpdateTime()); + if (!yesterday && !today) { sysSignIn.setSignInDays(0L); sysSignInMapper.updateSysSignIn(sysSignIn); } + //----------------------end 20241014----------------------------------- if (vipStopTime != null) { Date currentDate = new Date(); // true ===>过期