Merge branch 'dev-mitao'

mitao

2024-05-24 c7a3b2836d11492549501e23b66ab5d1cabb1d14

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.enums.StartStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -15,21 +16,17 @@
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.goods.service.async.AsyncMethodService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -51,7 +48,7 @@
    private final RedisService redisService;
    private final SysUserClient sysUserClient;
    private final RedissonClient redissonClient;

    private final AsyncMethodService asyncMethodService;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addGoodsSeckill(GoodsSeckillDTO dto) {
@@ -67,117 +64,19 @@
        this.saveBatch(goodsSeckills);

        for (GoodsSeckill goodsSeckill : goodsSeckills) {
            LocalDateTime startTime = goodsSeckill.getStartTime();
            LocalDateTime endTime = goodsSeckill.getEndTime();
            LocalDateTime checkTime = LocalDateTime.now().plusHours(1);
            //秒杀在一小时内开始
            if (checkTime.isAfter(startTime)) {
                Long id = goodsSeckill.getId();
                LocalDateTime now = LocalDateTime.now();
                String seckillStartTaskKey = DelayTaskEnum.SECKILL_START_TASK.getCode() + "-" + id;
                //秒杀已经开始
                if (now.isAfter(startTime)) {
                    //查询延时任务
                    DelayTask startDelayTask = sysUserClient.getDelayTask(
                            seckillStartTaskKey).getData();
                    if (StringUtils.isNull(startDelayTask)) {
                        redisService.setCacheObject(
                                seckillStartTaskKey,
                                startTime, 3L, TimeUnit.SECONDS);
                        startDelayTask = new DelayTask();
                        startDelayTask.setDelFlag(0);
                        startDelayTask.setCreateTime(LocalDateTime.now());
                        startDelayTask.setEndTime(LocalDateTime.now().plusSeconds(3));
                        startDelayTask.setRedisKey(
                                seckillStartTaskKey);
                        sysUserClient.addDelayTask(startDelayTask);
                    } else {
                        if (!startDelayTask.getEndTime().isEqual(startTime)) {
                            sysUserClient.deleteDelayTask(
                                    seckillStartTaskKey);
                            redisService.deleteObject(
                                    seckillStartTaskKey);
                            redisService.setCacheObject(
                                    seckillStartTaskKey,
                                    startTime, 3L, TimeUnit.SECONDS);
                            startDelayTask = new DelayTask();
                            startDelayTask.setDelFlag(0);
                            startDelayTask.setCreateTime(LocalDateTime.now());
                            startDelayTask.setEndTime(LocalDateTime.now().plusSeconds(3));
                            startDelayTask.setRedisKey(
                                    seckillStartTaskKey);
                            sysUserClient.addDelayTask(startDelayTask);
                        }
                    }
                } else {
                    DelayTask startDelayTask = sysUserClient.getDelayTask(
                            seckillStartTaskKey).getData();
                    Duration duration = Duration.between(LocalDateTime.now(), startTime);

                    if (StringUtils.isNull(startDelayTask)) {
                        redisService.setCacheObject(
                                seckillStartTaskKey,
                                startTime, duration.toMillis(), TimeUnit.MILLISECONDS);
                        startDelayTask = new DelayTask();
                        startDelayTask.setDelFlag(0);
                        startDelayTask.setCreateTime(LocalDateTime.now());
                        startDelayTask.setEndTime(startTime);
                        startDelayTask.setRedisKey(
                                seckillStartTaskKey);
                        sysUserClient.addDelayTask(startDelayTask);
                    } else {
                        if (!startDelayTask.getEndTime().isEqual(startTime)) {
                            sysUserClient.deleteDelayTask(
                                    seckillStartTaskKey);
                            redisService.deleteObject(
                                    seckillStartTaskKey);
                            redisService.setCacheObject(
                                    seckillStartTaskKey,
                                    startTime, duration.toMillis(), TimeUnit.MILLISECONDS);
                            startDelayTask = new DelayTask();
                            startDelayTask.setDelFlag(0);
                            startDelayTask.setCreateTime(LocalDateTime.now());
                            startDelayTask.setEndTime(startTime);
                            startDelayTask.setRedisKey(
                                    seckillStartTaskKey);
                            sysUserClient.addDelayTask(startDelayTask);
                        }
                    }
                }
                String seckillEndTaskKey = DelayTaskEnum.SECKILL_END_TASK.getCode() + "-" + id;
                DelayTask endDelayTask = sysUserClient.getDelayTask(
                        seckillEndTaskKey).getData();
                // 如果延时任务为空，创建延时任务控制活动定时开始和结束
                if (StringUtils.isNull(endDelayTask)) {
                    Duration duration = Duration.between(LocalDateTime.now(), endTime);
                    redisService.setCacheObject(
                            seckillEndTaskKey,
                            endTime, duration.toMillis(), TimeUnit.MILLISECONDS);
                    endDelayTask = new DelayTask();
                    endDelayTask.setDelFlag(0);
                    endDelayTask.setCreateTime(LocalDateTime.now());
                    endDelayTask.setEndTime(endTime);
                    endDelayTask.setRedisKey(seckillEndTaskKey);
                    sysUserClient.addDelayTask(endDelayTask);
                } else {
                    Duration duration = Duration.between(LocalDateTime.now(), endTime);
                    if (!endDelayTask.getEndTime().isEqual(endTime)) {
                        sysUserClient.deleteDelayTask(seckillEndTaskKey);
                        redisService.deleteObject(seckillEndTaskKey);
                        redisService.setCacheObject(
                                seckillEndTaskKey,
                                endTime, duration.toMillis(), TimeUnit.MILLISECONDS);
                        endDelayTask = new DelayTask();
                        endDelayTask.setDelFlag(0);
                        endDelayTask.setCreateTime(LocalDateTime.now());
                        endDelayTask.setEndTime(endTime);
                        endDelayTask.setRedisKey(seckillEndTaskKey);
                        sysUserClient.addDelayTask(endDelayTask);
                    }
                }
            GoodsSku goodsSku = goodsSkuService.getById(goodsSeckill.getGoodsSkuId());
            if (StringUtils.isNull(goodsSku)) {
                throw new ServiceException("商品不存在");
            }
            Integer seckillStock = goodsSeckill.getSeckillStock();
            goodsSkuService.lambdaUpdate()
                    .set(GoodsSku::getStock, goodsSku.getStock() - seckillStock)
                    .ge(GoodsSku::getStock, seckillStock)
                    .eq(GoodsSku::getId, goodsSku.getId());
            asyncMethodService.seckillScheduleTask(goodsSeckill);
        }
    }


    /**
     * 获取秒杀商品列表的分页数据
@@ -198,6 +97,7 @@
     * @param upd 商品秒杀数据传输对象
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updGoodsSeckill(GoodsSeckillUpd upd) {
        //查询秒杀商品
        GoodsSeckill goodsSeckill = this.getById(upd.getId());
@@ -206,6 +106,7 @@
        }
        GoodsSeckill goodsSeckillUpd = BeanUtils.copyBean(upd, GoodsSeckill.class);
        this.updateById(goodsSeckillUpd);
        asyncMethodService.seckillScheduleTask(goodsSeckill);
    }

    /**