From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index a327624..d5755f5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1116,8 +1116,12 @@
             String[] shopSalesKey = new String[shopSalesRank.size()];
             BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
+            Long shopId;
+            Shop shop;
             for (int i = 0; i < shopSalesRank.size(); i++) {
-                shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
+                shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
+                shop = this.getByShopId(shopId);
+                shopSalesKey[i] = shop.getShopName();
                 shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
             }
             plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);

--
Gitblit v1.7.1