From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java
index df3ef7e..f1b1ae1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java
@@ -42,12 +42,12 @@
// 秒杀已经开始
if (LocalDateTime.now().isAfter(startTime)) {
handleStartDelayTask(id, DelayTaskEnum.SECKILL_START_TASK, startTime, 3L);
+ log.info(">>>>>>>>>>>>>>>>>>>>秒杀商品：{} 开始秒杀<<<<<<<<<<<<<<<<<<<<", id);
} else {
Duration duration = Duration.between(LocalDateTime.now(), startTime);
handleStartDelayTask(id, DelayTaskEnum.SECKILL_START_TASK, startTime,
duration.getSeconds());
}
- log.info(">>>>>>>>>>>>>>>>>>>>秒杀商品：{} 开始秒杀<<<<<<<<<<<<<<<<<<<<", id);
// 秒杀结束延时任务
handleEndDelayTask(id, DelayTaskEnum.SECKILL_END_TASK, endTime);
}
@@ -79,7 +79,7 @@
}
private boolean isWithinOneHour(LocalDateTime startTime) {
- LocalDateTime checkTime = LocalDateTime.now().plusHours(1);
+ LocalDateTime checkTime = LocalDateTime.now().plusMinutes(61);
return checkTime.isAfter(startTime);
}
@@ -119,9 +119,6 @@
private void handleStartDelayTask(Long id, DelayTaskEnum delayTaskEnum, LocalDateTime startTime,
Long timeout) {
String startTaskKey = delayTaskEnum.getCode() + "-" + id;
- redisService.setCacheObject(
- startTaskKey,
- startTime, timeout, TimeUnit.SECONDS);
//查询延时任务
DelayTask startDelayTask = sysUserClient.getDelayTask(
startTaskKey, SecurityConstants.INNER).getData();
@@ -144,9 +141,10 @@
startDelayTask.setExecuteTime(LocalDateTime.now().plusSeconds(timeout));
startDelayTask.setRedisKey(
startTaskKey);
- sysUserClient.addDelayTask(startDelayTask, SecurityConstants.INNER);
+
}
}
+ redisService.setCacheObject(startTaskKey, startTime, timeout, TimeUnit.SECONDS);
log.info(">>>>>>>>>>>>>>>>>>>>延时任务{}执行了<<<<<<<<<<<<<<<<<<<<", startTaskKey);
}
}
--
Gitblit v1.7.1