zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改课程、会员延迟队列

Browse Source
This commit is contained in:
wuchunlei
2024-06-27 13:41:41 +08:00
parent e4907707b6
commit fe12920eb2
6 changed files with 132 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/peanut/modules/job/task/CourseTask.java
View File

@@ -1,12 +1,14 @@
package com.peanut.modules.job.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.peanut.config.DelayQueueConfig;
import com.peanut.modules.common.dao.UserCourseBuyDao;
import com.peanut.modules.common.entity.UserCourseBuyEntity;
import org.apache.commons.lang.time.DateUtils;
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;
import java.util.Date;
import java.util.List;
@@ -15,34 +17,52 @@ public class CourseTask implements ITask{
@Autowired
private UserCourseBuyDao userCourseBuyDao;
@Autowired
private RabbitTemplate rabbitTemplate;
@Override
public void run(String params) {
public void run(String userId) {
LambdaQueryWrapper<UserCourseBuyEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(UserCourseBuyEntity::getUserId,params);
wrapper.eq(UserCourseBuyEntity::getUserId,userId);
List<UserCourseBuyEntity> list = userCourseBuyDao.selectList(wrapper);
if (list.size() > 0) {
for (UserCourseBuyEntity userCourseBuyEntity : list) {
if (userCourseBuyEntity.getStartTime()==null) {
//未开始学习，超过一年自动开始
if (DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1).getTime()<=new Date().getTime()){
userCourseBuyEntity.setStartTime(DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1));
userCourseBuyEntity.setEndTime(DateUtils.addDays(userCourseBuyEntity.getStartTime(),userCourseBuyEntity.getDays()));
userCourseBuyDao.updateById(userCourseBuyEntity);
}
if (userCourseBuyEntity.getEndTime()!=null&&userCourseBuyEntity.getEndTime().getTime()<new Date().getTime()){
//结束时间，过期删除
userCourseBuyDao.deleteById(userCourseBuyEntity.getId());
}else {
//开始时间+有效天数，过期删除
if (userCourseBuyEntity.getEndTime().getTime() <= new Date().getTime()) {
userCourseBuyDao.deleteById(userCourseBuyEntity.getId());
if (userCourseBuyEntity.getStartTime()==null) {
//未开始学习，超过一年自动开始
if (DateUtils.isSameDay(DateUtils.addDays(DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1),2),new Date())){
rabbitTemplate.convertAndSend(
DelayQueueConfig.COURSE_EXCHANGE,
DelayQueueConfig.COURSE_ROUTING_KEY,
userCourseBuyEntity.getId(),
messagePostProcessor(DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1).getTime()-new Date().getTime())
);
System.out.println("未开始学习，超过一年自动开始，加入队列");
}
}else {
//结束时间，过期删除
if (DateUtils.isSameDay(DateUtils.addDays(new Date(),2),userCourseBuyEntity.getEndTime())){
rabbitTemplate.convertAndSend(
DelayQueueConfig.COURSE_EXCHANGE,
DelayQueueConfig.COURSE_ROUTING_KEY,
userCourseBuyEntity.getId(),
messagePostProcessor(userCourseBuyEntity.getEndTime().getTime()-new Date().getTime())
);
System.out.println("过期删除，加入队列");
}
}
}
}
System.out.println("课程过期更新完成");
}
}
private MessagePostProcessor messagePostProcessor(long date) {
return message -> {
message.getMessageProperties().setDelay((int)date);
return message;
};
}
}

52
src/main/java/com/peanut/modules/job/task/UserVipTask.java
View File

@@ -32,10 +32,10 @@ public class UserVipTask implements ITask{
private RabbitTemplate rabbitTemplate;
@Override
public void run(String params) {
public void run(String userId) {
LambdaQueryWrapper<UserVip> wrapper = new LambdaQueryWrapper();
wrapper.eq(UserVip::getState,0);
wrapper.eq(UserVip::getUserId,params);
wrapper.eq(UserVip::getUserId,userId);
List<UserVip> list = vipService.list(wrapper);
if (list.size() > 0) {
for (UserVip userVip : list) {
@@ -45,35 +45,34 @@ public class UserVipTask implements ITask{
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.addMinutes(new Date(),3),userVip.getEndTime())) {
// }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("----------------------------------------");
System.out.println("会员还剩7天，加入队列");
System.out.println("-------------------------会员还剩2天，加入队列");
}
}
}
@@ -81,8 +80,7 @@ public class UserVipTask implements ITask{
private MessagePostProcessor messagePostProcessor(long date) {
return message -> {
//设置有效期7天
message.getMessageProperties().setExpiration(String.valueOf(date));
message.getMessageProperties().setDelay((int)date);
return message;
};
}

33
src/main/java/com/peanut/modules/mq/Consumer/CourseConsumer.java Normal file
View File

@@ -0,0 +1,33 @@
package com.peanut.modules.mq.Consumer;
import com.peanut.config.DelayQueueConfig;
import com.peanut.modules.common.dao.UserCourseBuyDao;
import com.peanut.modules.common.entity.UserCourseBuyEntity;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
//购买的课程到期操作
@Component
public class CourseConsumer {
@Autowired
private UserCourseBuyDao userCourseBuyDao;
@RabbitListener(queues = DelayQueueConfig.COURSE_QUEUE)
public void courseConsumer(String userCourseBuyId) {
UserCourseBuyEntity userCourseBuyEntity = userCourseBuyDao.selectById(userCourseBuyId);
if (userCourseBuyEntity.getStartTime()==null) {
//未开始学习，超过一年自动开始
userCourseBuyEntity.setStartTime(DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1));
userCourseBuyEntity.setEndTime(DateUtils.addDays(userCourseBuyEntity.getStartTime(),userCourseBuyEntity.getDays()));
userCourseBuyDao.updateById(userCourseBuyEntity);
}else {
//结束时间，过期删除
userCourseBuyDao.deleteById(userCourseBuyEntity.getId());
}
}
}

4
src/main/java/com/peanut/modules/mq/Consumer/UserVipConsumer.java
View File

@@ -18,7 +18,7 @@ public class UserVipConsumer {
@Autowired
private MyUserDao userDao;
@RabbitListener(queues = DelayQueueConfig.USERVIP_DEAD_LETTER_QUEUE)
@RabbitListener(queues = DelayQueueConfig.USERVIP_QUEUE)
public void userVipConsumer(String userVipId) {
UserVip userVip = userVipDao.selectById(userVipId);
if(userVip == null){
@@ -29,7 +29,7 @@ public class UserVipConsumer {
MyUserEntity user = userDao.selectById(userVip.getUserId());
user.setVip("0");
userDao.updateById(user);
System.out.println("vip更新完成");
System.out.println(user.getName()+"-"+user.getTel()+"-"+user.getEmail()+"超v过期,vip更新完成");
}
}

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -293,7 +293,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
//完成度、上次学习时间
catalogueCompletion(courseCatalogueEntity);
// catalogueCompletion(courseCatalogueEntity);
//是否购买，生效时间
if ("1".equals(user.getVip())||"3".equals(user.getVip())){
//是超级会员或者国学会员