From 28654a1ce7ffe2b37b5864391827b68c13b2f6c1 Mon Sep 17 00:00:00 2001
From: haotianmingyue <2421912570@qq.com>
Date: Mon, 14 Oct 2024 10:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20SysSignInServiceImpl=20?=
 =?UTF-8?q?=E4=B8=AD=20shangxiangPlan=20=E6=96=B9=E6=B3=95=E4=B8=AD=20logi?=
 =?UTF-8?q?nVerificationInformation=20=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/xmComtroller/ApiController.java  | 4 ++--
 .../ruoyi/system/service/impl/SysSignInServiceImpl.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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  ===>过期