From 9fde9f917552f659d41fcfce5094f429a29b8ead Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 bd6853a..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
@@ -2,16 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
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.utils.sql.SqlUtil;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableSupport;
+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;
@@ -36,8 +33,6 @@
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
-
-import static com.ruoyi.common.core.utils.PageUtils.startPage;
/**
* <p>
@@ -69,15 +64,10 @@
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());
-
-
- PageDomain pageDomain = TableSupport.buildPageRequest();
- Boolean reasonable = pageDomain.getReasonable();
- PageHelper.startPage(goods.getPageCurr(), goods.getPageSize(), goods.getOrderByColumn()).setReasonable(reasonable);
List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
for (SeckillActivityVO seckillActivityVO : seckillActivityVOS) {
@@ -94,7 +84,54 @@
seckillActivityVO.setStatus(1); // 未开始
}
}
- return seckillActivityVOS;
+
+ Integer pageCurr = goods.getPageCurr();
+ Integer pageSize = goods.getPageSize();
+ String orderByColumn = goods.getOrderByColumn();
+ String isAsc = goods.getIsAsc();
+ // 排序
+ Comparator<SeckillActivityVO> comparator = getComparator(orderByColumn, isAsc);
+ List<SeckillActivityVO> sortedList = seckillActivityVOS.stream()
+ .sorted(comparator)
+ .collect(Collectors.toList());
+
+ // 分页
+ int startIndex = (pageCurr - 1) * pageSize;
+ int endIndex = Math.min(startIndex + pageSize, sortedList.size());
+
+ if (startIndex >= sortedList.size()) {
+ return new TableDataInfo();
+ }
+ 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 "tgs.selling_price":
+ comparator = Comparator.comparing(SeckillActivityVO::getSellingPrice);
+ break;
+ case "integral":
+ comparator = Comparator.comparing(SeckillActivityVO::getIntegral);
+ break;
+ case "sale_num":
+ comparator = Comparator.comparing(SeckillActivityVO::getSaleNum);
+ break;
+ // 添加其他排序字段
+ default:
+ comparator = Comparator.comparing(SeckillActivityVO::getId); // 默认按ID排序
+ break;
+ }
+
+ if ("desc".equalsIgnoreCase(isAsc)) {
+ comparator = comparator.reversed();
+ }
+ return comparator;
}
@Override
--
Gitblit v1.7.1