From 3e02abec44a648f01174a4c3494a96ccb46a3b1a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 11 十一月 2025 21:39:20 +0800
Subject: [PATCH] 会员&充值相关模块

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 07d6867..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
@@ -118,7 +118,8 @@
 
 
     public boolean endOfLife(String username) {
-        SysUser sysUser = userService.selectUserByUserName(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,9 +128,10 @@
             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);
+
             }
         }
         return true;
@@ -148,14 +150,14 @@
      */
     public String login(String nickName, String password, String code, String uuid)
     {
-        System.out.println("[[[[[[[[[[[[[[");
-        endOfLife(nickName);
         // 楠岃瘉鐮佹牎楠�
         validateCaptcha(nickName, code, uuid);
         // 鐧诲綍鍓嶇疆鏍¢獙
         loginPreCheck(nickName, password);
         // 鐢ㄦ埛楠岃瘉
         Authentication authentication = null;
+
+
         try
         {
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(nickName, password);
@@ -183,6 +185,9 @@
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(nickName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
+
+
+        endOfLife(nickName);
 
 
         SysUser sysUser = userService.selectUserByNickName(nickName);
@@ -283,4 +288,7 @@
         sysUser.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(sysUser);
     }
+
+
+
 }

--
Gitblit v1.9.1