From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 26 七月 2023 20:16:51 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java index 76bcae0..209348b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java @@ -3,6 +3,11 @@ import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.system.api.constant.DelayTaskEnum; +import com.ruoyi.system.api.service.RemoteActivityService; +import com.ruoyi.system.api.service.RemoteConfigService; +import com.ruoyi.system.api.service.RemoteCouponService; +import com.ruoyi.system.api.service.RemoteOrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.core.RedisTemplate; @@ -11,6 +16,7 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Date; /** @@ -26,6 +32,17 @@ private RedisTemplate<String, Object> redisTemplate; + @Resource + private RemoteConfigService remoteConfigService; + + @Resource + private RemoteCouponService remoteCouponService; + + @Resource + private RemoteActivityService remoteActivityService; + + @Resource + private RemoteOrderService remoteOrderService; public RedisListener(RedisMessageListenerContainer listenerContainer, RedisTemplate redisTemplate) { @@ -44,6 +61,19 @@ if(expiredKey.contains("-")){ String[] split = expiredKey.split("-"); String operation=split[0]; + if(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode().equals(operation)){ + //自动发送优惠券 + autoTimeSendCoupon(split[1]); + }else if(DelayTaskEnum.ACTIVITY_START_TASK.getCode().equals(operation)){ + //自动开始任务 + autoStartActivity(split[1]); + }else if(DelayTaskEnum.ACTIVITY_END_TASK.getCode().equals(operation)){ + //自动结束任务 + autoEndActivity(split[1]); + }else if(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode().equals(operation)){ + //自动结束任务 + autoCancelOrder(split[1]); + } //删除失效的key redisTemplate.delete(expiredKey); @@ -66,8 +96,32 @@ } //延时任务表 + //自动定时发送优惠券 + private void autoTimeSendCoupon(String couponId){ + log.info("autoTimeSendCoupon scheduler task is running :" + couponId); + remoteCouponService.autoTimeSendCoupon(couponId); + //删除定时任务 + remoteConfigService.deleteDelayTask(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode()+"-"+couponId); + } + private void autoStartActivity(String activityId){ + log.info("autoStartActivity scheduler task is running :" + activityId); + remoteActivityService.startActivity(activityId); + //删除定时任务 + remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode()+"-"+activityId); + } + private void autoEndActivity(String activityId){ + log.info("autoEndActivity scheduler task is running :" + activityId); + remoteActivityService.endActivity(activityId); + //删除定时任务 + remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode()+"-"+activityId); + } - + private void autoCancelOrder(String orderId){ + log.info("autoCancelOrder scheduler task is running :" + orderId); + remoteOrderService.autoCancelOrder(orderId); + //删除定时任务 + remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode()+"-"+orderId); + } } -- Gitblit v1.7.1