合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

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

@@ -3,6 +3,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -10,15 +12,19 @@
import com.ruoyi.other.api.domain.GoodsSeckill;
import com.ruoyi.other.api.domain.SeckillActivityInfo;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

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

@@ -39,6 +45,12 @@
    
    @Resource
    private GoodsSeckillService goodsSeckillService;

    @Resource
    private SeckillActivityInfoMapper seckillActivityInfoMapper;

    @Resource
    private GoodsService goodsService;
    
    
    
@@ -85,6 +97,31 @@


    /**
     * 秒杀活动列表
     */
    @GetMapping("/manageList")
    @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
    public R<IPage<SeckillActivityVO>> manageList(@ApiParam("页码") @RequestParam Integer pageNum,
                                                 @ApiParam("每一页数据大小") Integer pageSize,
                                                 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(3); //已结束
            }else if (startTime.isBefore(now)){
                record.setStatus(2); // 已开始
            }else {
                record.setStatus(1); // 未开始
            }
        }
        return R.ok(IPage);
    }

    /**
     * 新增秒杀活动
     */
    @PostMapping("/save")
@@ -128,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);
    }