Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java

@@ -1,12 +1,11 @@
package com.ruoyi.goods.task;

import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
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;
@@ -37,7 +36,6 @@
        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();
@@ -45,7 +43,6 @@
            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();
        if (StringUtils.isNotEmpty(groupPurchaseList)) {