From e591285b7e58fc593e6e1b6336038e3de8d74df7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 15:00:12 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 76d1c34..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
@@ -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) {
--
Gitblit v1.7.1