From 9e7b5dd397e17fe141cc7630df51699125857756 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 20 六月 2023 18:35:35 +0800
Subject: [PATCH] BUG修复和营销统计

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java |   88 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 82 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 8f7ae89..ba39772 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
@@ -5,6 +5,7 @@
 import com.ruoyi.order.domain.dto.*;
 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.MgtBaseShopDto;
 import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
 import org.apache.ibatis.annotations.Param;
@@ -139,7 +140,7 @@
     MgtBulletinBoardVo boardOrderTotal();
 
     /**
-    * @description getTotalOrderTotal
+    * @description getTotalOrderTotalOrderFrom
     * @param mgtBaseShopDto
     * @return MgtTotalOrderTotalVo
     * @author jqs34
@@ -148,7 +149,7 @@
     MgtTotalOrderTotalVo getTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-     * @description getTotalOrderTotal
+     * @description getTotalOrderTotalGoodsType
      * @param mgtBaseShopDto
      * @return MgtTotalOrderTotalVo
      * @author jqs34
@@ -157,7 +158,7 @@
     MgtTotalOrderTotalVo getTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-    * @description getTotalOrderTotal
+    * @description listTotalOrderTotal
     * @param mgtBaseShopDto
     * @return List<MgtMapTotalVo>
     * @author jqs34
@@ -166,7 +167,7 @@
     List<MgtMapTotalVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-     * @description getTotalOrderTotal
+     * @description listTotalOrderTotalGoodsType
      * @param mgtBaseShopDto
      * @return List<MgtMapTotalVo>
      * @author jqs34
@@ -176,7 +177,7 @@
 
 
     /**
-     * @description getTotalOrderTotal
+     * @description listTotalOrderTotalGoodsRank
      * @param mgtBaseShopDto
      * @return List<MgtMapTotalVo>
      * @author jqs34
@@ -185,11 +186,86 @@
     List<MgtMapTotalVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-     * @description getTotalOrderTotal
+     * @description listTotalOrderTotalOrderFrom
      * @param mgtBaseShopDto
      * @return List<MgtMapTotalVo>
      * @author jqs34
      * @date 2023/6/19 22:48
      */
     List<MgtMapTotalVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+    /**
+     * @description getTotalActivityTotal
+     * @author  jqs
+     * @date    2023/6/20 9:28
+     * @param mgtBaseShopDto
+     * @return  MgtTotalActivityTotalVo
+     */
+    MgtTotalActivityTotalVo getTotalActivityTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+
+    /**
+     * @description listTotalActivityTotalGoodsType
+     * @param mgtBaseShopDto
+     * @return List<MgtMapTotalVo>
+     * @author jqs34
+     * @date 2023/6/19 22:48
+     */
+    List<MgtMapTotalVo> listTotalActivityTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+    /**
+     * @description listTotalActivityTotal
+     * @param mgtBaseShopDto
+     * @return List<MgtMapTotalVo>
+     * @author jqs34
+     * @date 2023/6/19 22:48
+     */
+    List<MgtMapTotalVo> listTotalActivityTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+    /**
+     * @description  
+     * @author  jqs
+     * @date    2023/6/20 11:37
+     * @param mgtActivityAgeDto
+     * @return  List<Long>
+     */
+    List<Long> getUserIdAgeRank(@Param("param") MgtActivityAgeDto mgtActivityAgeDto);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/20 9:57
+     * @param mgtActivityAgeDto
+     * @return  MgtTotalActivityTotalVo
+     */
+    MgtTotalActivityTotalVo getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/20 15:50
+     * @param mgtBaseShopDto
+     * @return  MgtTotalDataTotalVo
+     */
+    MgtTotalDataTotalVo getTotalDataTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/20 18:16
+     * @param
+     * @return  Integer
+     */
+    Integer getReorderPerson(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/20 18:16
+     * @param
+     * @return  Integer
+     */
+    Integer getReturnedPerson(@Param("param")MgtBaseShopDto mgtBaseShopDto);
 }

--
Gitblit v1.7.1