From ed7cde0f64b01e95e11d6f66d1f27b05cea84332 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 09 七月 2023 18:13:00 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index f50b1d4..5b5a7f4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -153,6 +153,15 @@
/**
* @description getTotalOrderTotalGoodsType
+ * @param merTotalDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MerOrderTotalVo getMerTotalOrderTotalGoodsType(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description getTotalOrderTotalGoodsType
* @param mgtBaseShopDto
* @return MgtTotalOrderTotalVo
* @author jqs34
@@ -421,6 +430,14 @@
MerHomeShopTotalVo getMerHomeShopTotalVo(Long shopId);
/**
+ * @description
+ * @author cheny
+ * @param shopIds
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopsTotalVo(List<Long> shopIds);
+
+ /**
* @description 统计商户营业额
* @author jqs
* @date 2023/6/27 19:13
@@ -442,10 +459,69 @@
/**
* @description getTotalOrderTotalOrderFrom
- * @param mgtBaseShopDto
+ * @param merTotalDto
* @return MgtTotalOrderTotalVo
* @author jqs34
* @date 2023/6/19 22:24
*/
- MerOrderTotalVo getMerOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ MerOrderTotalVo getMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+
+ /**
+ * @description 获取各年龄层统计
+ * @author jqs
+ * @date 2023/7/4 10:27
+ * @param userIdList
+ * @return MgtMapTotalPlusVo
+ */
+ MgtMapTotalPlusVo listMerOrderDistributionTotal(@Param("userIdList")List<Long> userIdList);
+
+ /**
+ * @description 商户获取销售占比统计
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listMerOrderTotalGoodsType(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户获取销售排名
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalGoodsRank(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param shopId
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(@Param("shopId")Long shopId);
+
+
+ /**
+ * @description 平台获取商户订单记录
+ * @author jqs
+ * @date 2023/7/5 20:17
+ * @param page
+ * @param mgtShopAllOrderPageDto
+ * @return List<MgtShopAllOrderPageVo>
+ */
+ List<MgtShopAllOrderPageVo> pageMgtShopAllOrder(Page page, @Param("param")MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+
}
--
Gitblit v1.7.1