From 8ed4c618f93da2ab32568c4f2c54930193e061ec Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 26 十二月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 5fb90a6..4fb0723 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -119,6 +119,7 @@
 
     public boolean endOfLife(String username) {
         SysUser sysUser = userService.selectUserByNickName(username);
+        System.out.println(sysUser);
         if (sysUser.getPaid() != null && sysUser.getPaid().equals(0) && !"4".equals(sysUser.getStatus())) {
             Date startTime = sysUser.getCreateTime();
 
@@ -127,7 +128,7 @@
             LocalDateTime startDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
             long daysPassed = ChronoUnit.DAYS.between(startDateTime, LocalDateTime.now());
 
-            if (daysPassed > 7) {
+            if (daysPassed > sysUser.getRemainTime()) {
                 sysUser.setStatus("4");
                 userService.updateUserStatus(sysUser);
 
@@ -287,4 +288,7 @@
         sysUser.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(sysUser);
     }
+
+
+
 }

--
Gitblit v1.9.1