From 4780a3ac4a163ea0181d395488042ec443403f62 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 21 六月 2023 18:28:52 +0800
Subject: [PATCH] BUG修复和营销统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 02652ac..8681aba 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
@@ -19,6 +19,7 @@
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
import com.ruoyi.system.api.service.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.goods.Goods;
@@ -1299,7 +1300,7 @@
public MgtTotalOrderTotalVo getTotalOrderTotal(MgtBaseShopDto mgtBaseShopDto){
MgtTotalOrderTotalVo mgtTotalOrderTotalVo = orderMapper.getTotalOrderTotalOrderFrom(mgtBaseShopDto);
//MgtTotalOrderTotalVo mgtTotalOrderTotalVoGoodsType = orderMapper.getTotalOrderTotalGoodsType(mgtBaseShopDto);
- List<MgtMapTotalVo> mgtMapTotalVos = orderMapper.listTotalOrderTotal(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listTotalOrderTotal(mgtBaseShopDto);
if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
String[] orderTotalKey = new String[mgtMapTotalVos.size()];
Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
@@ -1314,7 +1315,7 @@
mgtTotalOrderTotalVo.setOrderMoneyValue(orderMoneyValue);
}
//获取商品分类销售数据
- List<MgtMapTotalVo> mgtMapTotalVoGoodsType = orderMapper.listTotalOrderTotalGoodsType(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listTotalOrderTotalGoodsType(mgtBaseShopDto);
if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
String[] goodsTypeKey = new String[mgtMapTotalVoGoodsType.size()];
Integer[] goodsTypeTotalValue = new Integer[mgtMapTotalVoGoodsType.size()];
@@ -1344,7 +1345,7 @@
mgtTotalOrderTotalVo.setGoodsTypeMoneyValue(goodsTypeMoneyValue);
}
//获取商品销售排名
- List<MgtMapTotalVo> goodsRankList = orderMapper.listTotalOrderTotalGoodsRank(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> goodsRankList = orderMapper.listTotalOrderTotalGoodsRank(mgtBaseShopDto);
if (goodsRankList != null && goodsRankList.size() > 0) {
String[] goodsRankKey = new String[goodsRankList.size()];
BigDecimal[] goodsRankValue = new BigDecimal[goodsRankList.size()];
@@ -1357,7 +1358,7 @@
mgtTotalOrderTotalVo.setGoodsRankValue(goodsRankValue);
}
//获取来源销售排名
- List<MgtMapTotalVo> orderFromList = orderMapper.listTotalOrderTotalOrderFrom(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> orderFromList = orderMapper.listTotalOrderTotalOrderFrom(mgtBaseShopDto);
if (orderFromList != null && orderFromList.size() > 0) {
String[] orderFromKey = new String[orderFromList.size()];
BigDecimal[] orderFromValue = new BigDecimal[orderFromList.size()];
@@ -1385,7 +1386,7 @@
//获取基础统计
MgtTotalActivityTotalVo totalActivityTotalVo = orderMapper.getTotalActivityTotal(mgtBaseShopDto);
//获取商品分类销售数据
- List<MgtMapTotalVo> mgtMapTotalVoGoodsType = orderMapper.listTotalActivityTotalGoodsType(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listTotalActivityTotalGoodsType(mgtBaseShopDto);
if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
String[] goodsTypeKey = new String[mgtMapTotalVoGoodsType.size()];
Integer[] goodsTypeTotalValue = new Integer[mgtMapTotalVoGoodsType.size()];
@@ -1418,7 +1419,7 @@
totalActivityTotalVo.setGoodsTypeMoneyValue(goodsTypeMoneyValue);
}
//获取订单分布
- List<MgtMapTotalVo> mgtMapTotalVos = orderMapper.listTotalActivityTotal(mgtBaseShopDto);
+ List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listTotalActivityTotal(mgtBaseShopDto);
if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
String[] orderTotalKey = new String[mgtMapTotalVos.size()];
Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
@@ -1469,4 +1470,16 @@
mgtTotalDataTotalVo.setReturnedPerson(returnedPerson);
return mgtTotalDataTotalVo;
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 15:26
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ */
+ @Override
+ public List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto){
+ return listMemberGoodsRank(mgtBasePlatformDto);
+ }
}
--
Gitblit v1.7.1