From 9a28d860cd452c5b09bea1d3c0e95df71ce68ad3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:11:46 +0800
Subject: [PATCH] 管理台bug和用户端生日卡

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 59 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..481bcc2 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
@@ -442,10 +442,67 @@
 
     /**
      * @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