Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-17 1d4473f81abe4ef200f23b781756a7da689dc718

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java

@@ -14,6 +14,7 @@
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import com.ruoyi.other.mapper.SeckillActivityInfoMapper;
import com.ruoyi.other.service.GoodsSeckillService;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.SeckillActivityInfoService;
import com.ruoyi.other.vo.SeckillActivityDetailVO;
import com.ruoyi.other.vo.SeckillActivityVO;
@@ -23,6 +24,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;

@@ -46,6 +48,9 @@

    @Resource
    private SeckillActivityInfoMapper seckillActivityInfoMapper;

    @Resource
    private GoodsService goodsService;
    
    
    
@@ -101,6 +106,18 @@
                                                 Goods goods)
    {
        IPage<SeckillActivityVO> IPage = seckillActivityInfoMapper.querySeckillActivity(Page.of(pageNum, pageSize), goods);
        for (SeckillActivityVO record : IPage.getRecords()) {
            LocalDateTime startTime = record.getStartTime();
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime endTime = record.getEndTime();
            if (endTime.isBefore(now)){
                record.setStatus(2); //已结束
            }else if (startTime.isBefore(now)){
                record.setStatus(1); // 已开始
            }else {
                record.setStatus(0); // 未开始
            }
        }
        return R.ok(IPage);
    }

@@ -148,6 +165,9 @@
        List<GoodsSeckill> goodsSeckills = goodsSeckillService.list(new LambdaQueryWrapper<GoodsSeckill>()
                .eq(GoodsSeckill::getSeckillActivityInfoId, id));
        seckillActivityInfo.setGoodsSeckills(goodsSeckills);
        Integer goodId = seckillActivityInfo.getGoodId();
        Goods goods = goodsService.getById(goodId);
        seckillActivityInfo.setGoods(goods);
        return R.ok(seckillActivityInfo);
    }