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 |  107 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 97 insertions(+), 10 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..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
@@ -5,8 +5,11 @@
 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.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;
@@ -139,7 +142,7 @@
     MgtBulletinBoardVo boardOrderTotal();
 
     /**
-    * @description getTotalOrderTotal
+    * @description getTotalOrderTotalOrderFrom
     * @param mgtBaseShopDto
     * @return MgtTotalOrderTotalVo
     * @author jqs34
@@ -148,7 +151,7 @@
     MgtTotalOrderTotalVo getTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-     * @description getTotalOrderTotal
+     * @description getTotalOrderTotalGoodsType
      * @param mgtBaseShopDto
      * @return MgtTotalOrderTotalVo
      * @author jqs34
@@ -157,39 +160,123 @@
     MgtTotalOrderTotalVo getTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-    * @description getTotalOrderTotal
+    * @description listTotalOrderTotal
     * @param mgtBaseShopDto
     * @return List<MgtMapTotalVo>
     * @author jqs34
     * @date 2023/6/19 22:48
     */
-    List<MgtMapTotalVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
-     * @description getTotalOrderTotal
+     * @description listTotalOrderTotalGoodsType
      * @param mgtBaseShopDto
      * @return List<MgtMapTotalVo>
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
-     * @description getTotalOrderTotal
+     * @description listTotalOrderTotalGoodsRank
      * @param mgtBaseShopDto
      * @return List<MgtMapTotalVo>
      * @author jqs34
      * @date 2023/6/19 22:48
      */
-    List<MgtMapTotalVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapTotalPlusVo> 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);
+    List<MgtMapTotalPlusVo> 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<MgtMapTotalPlusVo> listTotalActivityTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+    /**
+     * @description listTotalActivityTotal
+     * @param mgtBaseShopDto
+     * @return List<MgtMapTotalVo>
+     * @author jqs34
+     * @date 2023/6/19 22:48
+     */
+    List<MgtMapTotalPlusVo> 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);
+
+    /**
+     * @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