Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

@@ -11,6 +11,8 @@
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import com.ruoyi.other.service.GoodsSeckillService;
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 org.springframework.web.bind.annotation.*;
@@ -49,10 +51,10 @@
     */
    @GetMapping("/list")
    @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
    public AjaxResult list(Goods goods)
    public R<List<SeckillActivityVO>> list(Goods goods)
    {
        startPage();
        return AjaxResult.success(seckillActivityInfoService.listSeckillActivity(goods));
        return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
    }

    /**
@@ -60,16 +62,14 @@
     */
    @GetMapping("/detail/{id}")
    @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
    public AjaxResult detail(@PathVariable("id") Integer id)
    public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
    {
        return AjaxResult.success(seckillActivityInfoService.detail(id));
        return R.ok(seckillActivityInfoService.detail(id));
    }
    
    
    /**
     * 根据商品id和会员等级获取对应的秒杀活动
     * @param info
     * @return
     */
    @PostMapping("/getSeckillActivityInfo")
    public R<GoodsSeckill> getSeckillActivityInfo(@RequestBody GetSeckillActivityInfo info){