From 57580ea090d7637f0ad462ea169dea4001a80490 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期三, 28 六月 2023 00:08:50 +0800
Subject: [PATCH] 统计BUG
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 87 +++++++++++++++++++------------------------
1 files changed, 39 insertions(+), 48 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index fed90e8..2d5b088 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1681,36 +1681,45 @@
MgtPlTotalActivityTotalVo totalActivityTotalVo = orderMapper.getPlTotalActivityTotal(mgtBasePlatformDto);
//获取商品分类销售数据
List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listPlTotalActivityTotalGoodsType(mgtBasePlatformDto);
+ List<MgtMapTotalVo> goodsTypeTotalList = new ArrayList<>();
+ List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
+ totalActivityTotalVo.setCycleTotal(0);
+ totalActivityTotalVo.setCycleMoney(BigDecimal.ZERO);
+ totalActivityTotalVo.setServiceTotal(0);
+ totalActivityTotalVo.setServiceMoney(BigDecimal.ZERO);
+ totalActivityTotalVo.setExperienceTotal(0);
+ totalActivityTotalVo.setExperienceMoney(BigDecimal.ZERO);
if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
- String[] goodsTypeKey = new String[mgtMapTotalVoGoodsType.size()];
- Integer[] goodsTypeTotalValue = new Integer[mgtMapTotalVoGoodsType.size()];
- BigDecimal[] goodsTypeMoneyValue = new BigDecimal[mgtMapTotalVoGoodsType.size()];
+ MgtMapTotalVo mgtMapTotalVo;
+ MgtMapBigTotalVo mgtMapBigTotalVo;
// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
for (int i = 0; i < mgtMapTotalVoGoodsType.size(); i++) {
- goodsTypeTotalValue[i] = mgtMapTotalVoGoodsType.get(i).getMapValueFirst();
- goodsTypeMoneyValue[i] = mgtMapTotalVoGoodsType.get(i).getMapValueSecond();
+ mgtMapTotalVo = new MgtMapTotalVo();
+ mgtMapBigTotalVo = new MgtMapBigTotalVo();
+ mgtMapTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
+ mgtMapBigTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
if(mgtMapTotalVoGoodsType.get(i).getMapKey().equals("1")){
- goodsTypeKey[i] = "周期";
- totalActivityTotalVo.setCycleTotal(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
- totalActivityTotalVo.setCycleMoney(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
- totalActivityTotalVo.setCyclePerson(mgtMapTotalVoGoodsType.get(i).getMapValueThird());
+ mgtMapTotalVo.setMapKey("周期");
+ mgtMapBigTotalVo.setMapKey("周期");
+ totalActivityTotalVo.setCycleTotal(totalActivityTotalVo.getCycleTotal()+mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
+ totalActivityTotalVo.setCycleMoney(totalActivityTotalVo.getCycleMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
}else if(mgtMapTotalVoGoodsType.get(i).getMapKey().equals("2")){
- goodsTypeKey[i] = "服务";
- totalActivityTotalVo.setServiceTotal(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
- totalActivityTotalVo.setServiceMoney(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
- totalActivityTotalVo.setServicePerson(mgtMapTotalVoGoodsType.get(i).getMapValueThird());
+ mgtMapTotalVo.setMapKey("服务");
+ mgtMapBigTotalVo.setMapKey("服务");
+ totalActivityTotalVo.setServiceTotal(totalActivityTotalVo.getServiceTotal()+mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
+ totalActivityTotalVo.setServiceMoney(totalActivityTotalVo.getServiceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
}else if(mgtMapTotalVoGoodsType.get(i).getMapKey().equals("3")){
- goodsTypeKey[i] = "体验";
- totalActivityTotalVo.setExperienceTotal(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
- totalActivityTotalVo.setExperienceMoney(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
- totalActivityTotalVo.setExperiencePerson(mgtMapTotalVoGoodsType.get(i).getMapValueThird());
+ mgtMapTotalVo.setMapKey("体验");
+ mgtMapBigTotalVo.setMapKey("体验");
+ totalActivityTotalVo.setExperienceTotal(totalActivityTotalVo.getExperienceTotal()+mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
+ totalActivityTotalVo.setExperienceMoney(totalActivityTotalVo.getExperienceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
}else if(mgtMapTotalVoGoodsType.get(i).getMapKey().equals("4")){
- goodsTypeKey[i] = "单品";
+ mgtMapTotalVo.setMapKey("单品");
+ mgtMapBigTotalVo.setMapKey("单品");
}
}
- totalActivityTotalVo.setGoodsTypeKey(goodsTypeKey);
- totalActivityTotalVo.setGoodsTypeTotalValue(goodsTypeTotalValue);
- totalActivityTotalVo.setGoodsTypeMoneyValue(goodsTypeMoneyValue);
+ totalActivityTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
+ totalActivityTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
}
//获取订单分布
List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listPlTotalActivityTotal(mgtBasePlatformDto);
@@ -1742,40 +1751,22 @@
Map<Long, MgtSimpleShopVo> map = simpleShopVoList.stream()
.collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
//商户活动次数排名
- List<MgtMapTotalPlusVo> shopActivityRank = orderMapper.listPlTotalShopActivityRank(mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> shopActivityRank = orderMapper.listPlTotalShopActivityRank(mgtBasePlatformDto);
if (shopActivityRank != null && shopActivityRank.size() > 0) {
- String[] shopActivityRankKey = new String[shopActivityRank.size()];
- Integer[] shopActivityRankValue = new Integer[shopActivityRank.size()];
- for (int i = 0; i < shopActivityRank.size(); i++) {
- shopActivityRankKey[i] = map.get(Long.valueOf(shopActivityRank.get(i).getMapKey())).getShopName();
- shopActivityRankValue[i] = shopActivityRank.get(i).getMapValueFirst();
- }
- totalActivityTotalVo.setActivityRankKey(shopActivityRankKey);
- totalActivityTotalVo.setActivityRankValue(shopActivityRankValue);
+ shopActivityRank = bigListRemoveNull(shopActivityRank);
+ totalActivityTotalVo.setShopSalesRankList(shopActivityRank);
}
//商户活动销售额排名
- List<MgtMapTotalPlusVo> shopActivitySalesRank = orderMapper.listPlTotalShopActivitySalesRank(mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> shopActivitySalesRank = orderMapper.listPlTotalShopActivitySalesRank(mgtBasePlatformDto);
if (shopActivitySalesRank != null && shopActivitySalesRank.size() > 0) {
- String[] shopActivitySalesRankKey = new String[shopActivitySalesRank.size()];
- BigDecimal[] shopActivitySalesRankValue = new BigDecimal[shopActivitySalesRank.size()];
- for (int i = 0; i < shopActivitySalesRank.size(); i++) {
- shopActivitySalesRankKey[i] = map.get(Long.valueOf(shopActivityRank.get(i).getMapKey())).getShopName();
- shopActivitySalesRankValue[i] = shopActivitySalesRank.get(i).getMapValueSecond();
- }
- totalActivityTotalVo.setShopSalesRankKey(shopActivitySalesRankKey);
- totalActivityTotalVo.setShopSalesRankValue(shopActivitySalesRankValue);
+ shopActivitySalesRank = bigListRemoveNull(shopActivitySalesRank);
+ totalActivityTotalVo.setShopSalesRankList(shopActivitySalesRank);
}
//活动销售额排名
- List<MgtMapTotalPlusVo> activitySalesRank = orderMapper.listPlTotalActivitySalesRank(mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> activitySalesRank = orderMapper.listPlTotalActivitySalesRank(mgtBasePlatformDto);
if (activitySalesRank != null && activitySalesRank.size() > 0) {
- String[] activitySalesRankKey = new String[activitySalesRank.size()];
- BigDecimal[] activitySalesRankValue = new BigDecimal[activitySalesRank.size()];
- for (int i = 0; i < activitySalesRank.size(); i++) {
- activitySalesRankKey[i] = activitySalesRank.get(i).getMapKey();
- activitySalesRankValue[i] = activitySalesRank.get(i).getMapValueSecond();
- }
- totalActivityTotalVo.setActivitySalesRankKey(activitySalesRankKey);
- totalActivityTotalVo.setActivitySalesRankValue(activitySalesRankValue);
+ activitySalesRank = bigListRemoveNull(activitySalesRank);
+ totalActivityTotalVo.setActivitySalesRankList(activitySalesRank);
}
return totalActivityTotalVo;
}
--
Gitblit v1.7.1