From b0cc9bd3619e69fa4c8bbdedebb56435cfd74a8f Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 17 一月 2025 11:24:51 +0800 Subject: [PATCH] 12.18 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java index a27c0fb..6155d24 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.AppUser; +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; @@ -62,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()); @@ -98,23 +100,26 @@ int endIndex = Math.min(startIndex + pageSize, sortedList.size()); if (startIndex >= sortedList.size()) { - return new ArrayList<>(); + return new TableDataInfo(); } - - return seckillActivityVOS; + 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) { Comparator<SeckillActivityVO> comparator; switch (orderByColumn) { - case "sellingPrice": + case "tgs.selling_price": comparator = Comparator.comparing(SeckillActivityVO::getSellingPrice); break; case "integral": comparator = Comparator.comparing(SeckillActivityVO::getIntegral); break; - case "saleNum": + case "sale_num": comparator = Comparator.comparing(SeckillActivityVO::getSaleNum); break; // 添加其他排序字段 -- Gitblit v1.7.1