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/mapper/order/OrderMapper.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 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 ba39772..d21cfb1 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
@@ -6,8 +6,10 @@
 import com.ruoyi.order.domain.pojo.order.Order;
 import com.ruoyi.order.domain.vo.*;
 import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
 import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
 import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -164,7 +166,7 @@
     * @author jqs34
     * @date 2023/6/19 22:48
     */
-    List<MgtMapTotalVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
      * @description listTotalOrderTotalGoodsType
@@ -173,7 +175,7 @@
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
@@ -183,7 +185,7 @@
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
      * @description listTotalOrderTotalOrderFrom
@@ -192,7 +194,7 @@
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
@@ -212,7 +214,7 @@
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalActivityTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalActivityTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
@@ -222,7 +224,7 @@
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalActivityTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalActivityTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
      * @description  
@@ -268,4 +270,13 @@
      * @return  Integer
      */
     Integer getReturnedPerson(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/21 15:27
+     * @param mgtBasePlatformDto
+     * @return  List<MgtMapTotalVo>
+     */
+    List<MgtMapTotalVo> listMemberGoodsRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 }

--
Gitblit v1.7.1