diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java index 02d401f..18abd45 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java @@ -130,16 +130,19 @@ public class AppSeckillActivityController { @GetMapping("/spuList") @Parameter(name = "count", description = "需要展示的数量", example = "6") - @Operation(summary = "获得现在进行的秒杀活动分页") + @Operation(summary = "获得秒杀活动分页") public CommonResult> getSeckillActivitySupList(@RequestParam(name = "count", defaultValue = "3") Integer count) { AppSeckillActivityPageReqVO pageReqVO = new AppSeckillActivityPageReqVO(); - Page page = new Page<>(1, 3); - ; if (count != null && count != 0) { - page = new Page<>(1, count); + pageReqVO.setPageNo(1); + pageReqVO.setPageSize(count); } +// Page page = new Page<>(1, 3); +// if (count != null && count != 0) { +// page = new Page<>(1, count); +// } // 先找出当前时间对应的配置时间段id - List configIdList = new ArrayList<>(); +/* List configIdList = new ArrayList<>(); try { List timeList = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus()); SimpleDateFormat format = new SimpleDateFormat("HH:mm"); @@ -159,9 +162,9 @@ public class AppSeckillActivityController { return success(null); } // 获取满足当前正在进行的活动 - PageResult pageResult = activityService.getRunningActivityByConfigIdsCount(configIdList, page); + PageResult pageResult = activityService.getRunningActivityByConfigIdsCount(configIdList, page);*/ // 1. 查询满足当前阶段的活动 -// PageResult pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO); + PageResult pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO); if (CollUtil.isEmpty(pageResult.getList())) { return success(null); }