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 |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 f848589..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
@@ -494,4 +511,17 @@
      * @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