ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
@@ -63,7 +63,7 @@ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"}) public R<TableDataInfo> list(Goods goods) { return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods))); return R.ok(seckillActivityInfoService.listSeckillActivity(goods)); } /** ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java
@@ -1,5 +1,6 @@ package com.ruoyi.other.service; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.other.api.domain.Goods; import com.ruoyi.other.api.domain.SeckillActivityInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,7 +19,7 @@ */ public interface SeckillActivityInfoService extends IService<SeckillActivityInfo> { List<SeckillActivityVO> listSeckillActivity(Goods goods); TableDataInfo<SeckillActivityVO> listSeckillActivity(Goods goods); SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.core.utils.PageUtils; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.order.feignClient.OrderClient; @@ -63,7 +64,7 @@ private GoodsEvaluateService goodsEvaluateService; @Override public List<SeckillActivityVO> listSeckillActivity(Goods goods) { public TableDataInfo<SeckillActivityVO> listSeckillActivity(Goods goods) { LoginUser loginUserApplet = tokenService.getLoginUserApplet(); AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid()); goods.setVipId(appUser.getVipId()); @@ -99,9 +100,13 @@ int endIndex = Math.min(startIndex + pageSize, sortedList.size()); if (startIndex >= sortedList.size()) { return new ArrayList<>(); return new TableDataInfo(); } return sortedList.subList(startIndex, endIndex); TableDataInfo tableDataInfo = new TableDataInfo(); tableDataInfo.setRows(sortedList.subList(startIndex, endIndex)); tableDataInfo.setTotal(sortedList.size()); tableDataInfo.setCode(200); return tableDataInfo; } private Comparator<SeckillActivityVO> getComparator(String orderByColumn, String isAsc) {