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/task/GoodsScheduler.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
index 85603d1..72b5434 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
@@ -1,11 +1,11 @@
package com.ruoyi.goods.task;
-import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
-import com.ruoyi.goods.domain.GoodsGroupPurchase;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.async.AsyncMethodService;
+import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSeckill;
import java.time.LocalDateTime;
import java.util.List;
@@ -36,19 +36,17 @@
log.info(">>>>>>>>>>>>>>>>>>>>定时任务秒杀/团购开始执行<<<<<<<<<<<<<<<<<<<<");
LocalDateTime checkTime = LocalDateTime.now().plusHours(1);
List<GoodsSeckill> list = goodsSeckillService.lambdaQuery()
- .eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES)
.eq(GoodsSeckill::getStartStatus, StartStatusEnum.NOT_STARTED)
.le(GoodsSeckill::getStartTime, checkTime)
.list();
- for (GoodsSeckill goodsSeckill : list) {
- asyncMethodService.seckillScheduleTask(goodsSeckill);
+ if (StringUtils.isNotEmpty(list)) {
+ asyncMethodService.seckillScheduleTask(list);
}
List<GoodsGroupPurchase> groupPurchaseList = goodsGroupPurchaseService.lambdaQuery()
- .eq(GoodsGroupPurchase::getListingStatus, ListingStatusEnum.ON_SHELVES)
.eq(GoodsGroupPurchase::getStartStatus, StartStatusEnum.NOT_STARTED)
.le(GoodsGroupPurchase::getStartTime, checkTime).list();
- for (GoodsGroupPurchase goodsGroupPurchase : groupPurchaseList) {
- asyncMethodService.groupPurchaseScheduleTask(goodsGroupPurchase);
+ if (StringUtils.isNotEmpty(groupPurchaseList)) {
+ asyncMethodService.groupPurchaseScheduleTask(groupPurchaseList);
}
}
}
--
Gitblit v1.7.1