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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 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 385dfad..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 @@ -14,6 +14,7 @@ import com.ruoyi.other.mapper.GoodsShopMapper; import com.ruoyi.other.mapper.SeckillActivityInfoMapper; import com.ruoyi.other.mapper.ShopMapper; +import com.ruoyi.other.service.GoodsEvaluateService; import com.ruoyi.other.service.GoodsSeckillService; import com.ruoyi.other.service.GoodsService; import com.ruoyi.other.service.SeckillActivityInfoService; @@ -57,12 +58,15 @@ private GoodsService goodsService; @Resource private OrderClient orderClient; + @Resource + private GoodsEvaluateService goodsEvaluateService; @Override public List<SeckillActivityVO> listSeckillActivity(Goods goods) { 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(); @@ -78,7 +82,51 @@ 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 @@ -131,6 +179,17 @@ seckillActivityDetailVO.setShopList(shops); Integer integer = orderClient.getGoodsSaleNum(goods.getId(), 2).getData(); seckillActivityDetailVO.setSaleNum(integer); + GoodsEvaluate goodsEvaluate = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "") + .orderByDesc(GoodsEvaluate::getGrade).eq(GoodsEvaluate::getStatus, 2).eq(GoodsEvaluate::getDelFlag, 0).last(" limit 0, 1").one(); + if (null != goodsEvaluate) { + AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId()); + if(null != appUserById){ + goodsEvaluate.setUserName(appUserById.getName()); + goodsEvaluate.setAvatar(appUserById.getAvatar()); + goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId())); + } + } + seckillActivityDetailVO.setGoodsEvaluate(goodsEvaluate); return seckillActivityDetailVO; } -- Gitblit v1.7.1