From a8e56f03a22c722ccf3f67a408919e6c8f256de3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 10 八月 2023 01:45:01 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 100 insertions(+), 5 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 55acdf9..b44c461 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
@@ -92,7 +92,7 @@
      * @param
      * @return  MgtOrderTotal
      */
-    MgtOrderTotal totalOrderFirst();
+    MgtOrderTotal totalOrderFirst(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
 
     /**
      * @description  统计门店订单总数
@@ -141,6 +141,15 @@
      * @date 2023/6/18 17:20
      */
     MgtBulletinBoardVo boardOrderTotal();
+
+    /**
+     * @description  活动人数统计
+     * @author  jqs
+     * @date    2023/8/3 21:12
+     * @param
+     * @return  Integer
+     */
+    Integer activityUserTotal();
 
     /**
     * @description getTotalOrderTotalOrderFrom
@@ -471,10 +480,10 @@
      * @description 获取各年龄层统计
      * @author  jqs
      * @date    2023/7/4 10:27
-     * @param userIdList
+     * @param merTotalDto
      * @return  MgtMapTotalPlusVo
      */
-    MgtMapTotalPlusVo listMerOrderDistributionTotal(@Param("userIdList")List<Long> userIdList);
+    List<MgtMapTotalPlusVo> listMerOrderDistributionTotal(@Param("param")MerTotalDto merTotalDto);
 
     /**
      * @description 商户获取销售占比统计
@@ -507,10 +516,10 @@
      * @description  商户端订单管理统计
      * @author  jqs
      * @date    2023/7/4 16:27
-     * @param shopId
+     * @param merOrderPageDto
      * @return  MerTotalOrderVo
      */
-    MerTotalOrderVo totalMerOrder(@Param("shopId")Long shopId);
+    MerTotalOrderVo totalMerOrder(@Param("param")MerOrderPageDto merOrderPageDto);
 
 
     /**
@@ -532,4 +541,90 @@
      * @return  Integer
      */
     Integer countUserActivityByActivity(@Param("userId")Long userId, @Param("activityId")String activityId);
+
+
+    /**
+     * @description  员工端活动订单统计
+     * @author  jqs
+     * @date    2023/7/17 15:25
+     * @param staffTotalDto
+     * @return  StaffActivityOrderTotalVo
+     */
+    StaffActivityOrderTotalVo getStaffActivityOrderTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  员工端活动统计
+     * @author  jqs
+     * @date    2023/7/17 15:51
+     * @param staffTotalDto
+     * @return  StaffActivityTotalVo
+     */
+    StaffActivityTotalVo getStaffActivityTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+
+    /**
+     * @description 获取各年龄层统计
+     * @author  jqs
+     * @date    2023/7/4 10:27
+     * @param userIdList
+     * @return  MgtMapTotalPlusVo
+     */
+    MgtMapTotalPlusVo listStaffActivityOrderDistributionTotal(@Param("userIdList")List<Long> userIdList,@Param("shopId")Long shopId,@Param("activityId")String activityId);
+
+
+    /**
+     * @description  员工端活动统计销售占比
+     * @author  jqs
+     * @date    2023/7/17 17:05
+     * @param staffTotalDto
+     * @return  List<MgtMapTotalPlusVo>
+     */
+    List<MgtMapTotalPlusVo> listStaffOrderTotalGoodsType(@Param("param")StaffTotalDto staffTotalDto);
+
+
+    /**
+     * @description  员工端获取活动获客人数
+     * @author  jqs
+     * @date    2023/7/17 18:44
+     * @param staffTotalDto
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapIntTotalVo> getStaffActivityGetMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  员工端获取活动获客人数
+     * @author  jqs
+     * @date    2023/7/17 18:44
+     * @param staffTotalDto
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  获取用户商品购买数量
+     * @author  jqs
+     * @date    2023/7/23 18:17
+     * @param userId
+     * @param goodsId
+     * @return  Integer
+     */
+    Integer countUserBuyGoodsNum(@Param("userId")Long userId, @Param("goodsId")String goodsId);
+
+
+    /**
+     * @description  获取商户订单统计
+     * @author  jqs
+     * @date    2023/8/4 10:25
+     * @param mgtShopAllOrderPageDto
+     * @return  MgtShopAllOrderTotal
+     */
+    MgtShopAllOrderTotal getMgtShopAllOrderTotal(@Param("param")MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+
+    /**
+     * 分页获取消费记录
+     * @param merOrderPageDto
+     * @return
+     */
+    List<MerOrderPageVo> pageMerMemberPayOrder(Page page,@Param("param") MerMemberNoClearOrderDto merOrderPageDto);
 }

--
Gitblit v1.7.1