From 1da3707e6406188996a93c3e0e14a69e7d13d3f2 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 22 Oct 2025 14:41:53 +0800
Subject: [PATCH] =?UTF-8?q?vip=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/job/task/UserVipTask.java  | 54 +------------------
 .../modules/mq/Consumer/UserVipConsumer.java  | 22 ++++----
 2 files changed, 13 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/peanut/modules/job/task/UserVipTask.java b/src/main/java/com/peanut/modules/job/task/UserVipTask.java
index 3c63e253..16d48a73 100644
--- a/src/main/java/com/peanut/modules/job/task/UserVipTask.java
+++ b/src/main/java/com/peanut/modules/job/task/UserVipTask.java
@@ -1,19 +1,11 @@
 package com.peanut.modules.job.task;
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.peanut.common.utils.MailUtil;
-import com.peanut.config.DelayQueueConfig;
-import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.common.utils.DateUtils;
 import com.peanut.modules.common.entity.UserVip;
-import com.peanut.modules.common.service.MyUserService;
 import com.peanut.modules.master.service.UserVipService;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.amqp.core.MessagePostProcessor;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,10 +18,6 @@ public class UserVipTask implements ITask{
 
     @Autowired
     private UserVipService vipService;
-    @Autowired
-    private MyUserService userService;
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
 
     @Override
     public void run(String params) {
@@ -38,49 +26,11 @@ public class UserVipTask implements ITask{
         List<UserVip> list = vipService.list(wrapper);
         if (list.size() > 0) {
             for (UserVip userVip : list) {
-                MyUserEntity user = userService.getById(userVip.getUserId());
-                if (userVip.getEndTime().getTime()<new Date().getTime()){
+                if (DateUtils.stringToDate(DateUtils.format(userVip.getEndTime(),"yyyy-MM-dd")+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()<new Date().getTime()){
                     userVip.setState(1);
                     vipService.saveOrUpdate(userVip);
-                    user.setVip("0");
-                    userService.saveOrUpdate(user);
-//                }else if (DateUtils.isSameDay(DateUtils.addDays(new Date(),60),userVip.getEndTime())) {
-//                    try {
-//                        if (StringUtils.isNotEmpty(user.getTel())){
-//                            userService.sendCodeForRegister(user.getTel(),"VIPWillExpire",86);
-//                        }else if (StringUtils.isNotEmpty(user.getEmail())) {
-//                            MailUtil.sendMail("太湖超V提醒","超V还有2月到期",user.getEmail());
-//                        }
-//                    }catch (Exception e) {
-//                        logger.error("userVipTask定时任务超V提醒出错，错误为：{}", e.getMessage());
-//                    }
-//                }else if (DateUtils.isSameDay(DateUtils.addDays(new Date(),30),userVip.getEndTime())) {
-//                    try {
-//                        if (StringUtils.isNotEmpty(user.getTel())){
-//                            userService.sendCodeForRegister(user.getTel(),"VIPWillExpire",86);
-//                        }else if (StringUtils.isNotEmpty(user.getEmail())) {
-//                            MailUtil.sendMail("太湖超V提醒","超V还有一月到期",user.getEmail());
-//                        }
-//                    }catch (Exception e) {
-//                        logger.error("userVipTask定时任务超V提醒出错，错误为：{}", e.getMessage());
-//                    }
-                }else if (DateUtils.isSameDay(DateUtils.addDays(new Date(),2),userVip.getEndTime())) {
-                    rabbitTemplate.convertAndSend(
-                            DelayQueueConfig.USERVIP_EXCHANGE,
-                            DelayQueueConfig.USERVIP_ROUTING_KEY,
-                            userVip.getId(),
-                            messagePostProcessor(userVip.getEndTime().getTime()-new Date().getTime())
-                    );
-                    System.out.println(new Date()+"-"+userVip.getUserId()+"-会员还剩2天，加入队列");
                 }
             }
         }
     }
-
-    private MessagePostProcessor messagePostProcessor(long date) {
-        return message -> {
-            message.getMessageProperties().setDelay((int)date);
-            return message;
-        };
-    }
 }
diff --git a/src/main/java/com/peanut/modules/mq/Consumer/UserVipConsumer.java b/src/main/java/com/peanut/modules/mq/Consumer/UserVipConsumer.java
index 90d34520..61899c9d 100644
--- a/src/main/java/com/peanut/modules/mq/Consumer/UserVipConsumer.java
+++ b/src/main/java/com/peanut/modules/mq/Consumer/UserVipConsumer.java
@@ -23,17 +23,17 @@ public class UserVipConsumer {
 
     @RabbitListener(queues = DelayQueueConfig.USERVIP_QUEUE)
     public void userVipConsumer(String userVipId) {
-        UserVip userVip = userVipDao.selectById(userVipId);
-        if(userVip != null){
-            if(DateUtils.addSeconds(new Date(),3).getTime()>userVip.getEndTime().getTime()){
-                userVip.setState(1);
-                userVipDao.updateById(userVip);
-                MyUserEntity user = userDao.selectById(userVip.getUserId());
-                user.setVip("0");
-                userDao.updateById(user);
-//                System.out.println(user.getName()+"-"+user.getTel()+"-"+user.getEmail()+"超v过期,vip更新完成");
-            }
-        }
+//        UserVip userVip = userVipDao.selectById(userVipId);
+//        if(userVip != null){
+//            if(DateUtils.addSeconds(new Date(),3).getTime()>userVip.getEndTime().getTime()){
+//                userVip.setState(1);
+//                userVipDao.updateById(userVip);
+//                MyUserEntity user = userDao.selectById(userVip.getUserId());
+//                user.setVip("0");
+//                userDao.updateById(user);
+////                System.out.println(user.getName()+"-"+user.getTel()+"-"+user.getEmail()+"超v过期,vip更新完成");
+//            }
+//        }
     }
 
 }