From 74e9f251117006498d6067a83837821ae21d96b4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 13:51:58 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 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 f994879..a27c0fb 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
@@ -66,6 +66,7 @@
         LoginUser loginUserApplet = tokenService.getLoginUserApplet();
         AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
         goods.setVipId(appUser.getVipId());
+
         List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
         for (SeckillActivityVO seckillActivityVO : seckillActivityVOS) {
             Integer data = orderClient.getGoodsSaleNum(seckillActivityVO.getGoodsId(), 2).getData();
@@ -81,9 +82,53 @@
                 seckillActivityVO.setStatus(1); // 未开始
             }
         }
+
+        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 ArrayList<>();
+        }
+
         return seckillActivityVOS;
     }
 
+    private Comparator<SeckillActivityVO> getComparator(String orderByColumn, String isAsc) {
+        Comparator<SeckillActivityVO> comparator;
+
+        switch (orderByColumn) {
+            case "sellingPrice":
+                comparator = Comparator.comparing(SeckillActivityVO::getSellingPrice);
+                break;
+            case "integral":
+                comparator = Comparator.comparing(SeckillActivityVO::getIntegral);
+                break;
+            case "saleNum":
+                comparator = Comparator.comparing(SeckillActivityVO::getSaleNum);
+                break;
+            // 添加其他排序字段
+            default:
+                comparator = Comparator.comparing(SeckillActivityVO::getId); // 默认按ID排序
+                break;
+        }
+
+        if ("desc".equalsIgnoreCase(isAsc)) {
+            comparator = comparator.reversed();
+        }
+        return comparator;
+    }
+
     @Override
     public SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude) {
         Integer vipId = 0;

--
Gitblit v1.7.1