From 5eb61b4ee44c9eb2394793d436310edbe917db59 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 00:23:42 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index ab411fd..5780232 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -16,6 +16,7 @@
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,8 +28,10 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author wzy
@@ -53,7 +56,28 @@
             queryDto.setMemberId(loginUser.getId());
         }
         Page<MallGoodsListVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
-        return this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
+        IPage<MallGoodsListVo> result = this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
+
+        LambdaQueryWrapper<MallGoods> goodsQuery = new LambdaQueryWrapper<>();
+        goodsQuery.eq(MallGoods::getIsSale, 1)
+                .eq(MallGoods::getIsNormal, 1)
+                .orderByDesc(MallGoods::getVolume)
+                .last("limit 10");
+        List<MallGoods> mallGoods = this.baseMapper.selectList(goodsQuery);
+        Map<Long, Integer> goodsMap = new HashMap<>();
+        AtomicInteger rank = new AtomicInteger(1);
+        mallGoods.forEach(item -> {
+            goodsMap.put(item.getId(), rank.getAndIncrement());
+        });
+
+        result.getRecords().forEach(item -> {
+            Integer goodsRank = goodsMap.get(item.getId());
+            if (goodsRank != null) {
+                item.setRank(goodsRank);
+            }
+
+        });
+        return result;
     }
 
     @Override

--
Gitblit v1.9.1