From 0b413f3fd67110cfd7752f27eb171bde06edc4b4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 18 八月 2023 18:56:39 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 201 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 197 insertions(+), 4 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 fcad0f5..c403e01 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
@@ -4,6 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
+import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
+import com.ruoyi.order.domain.vo.MerOrderPageVo;
+import com.ruoyi.order.domain.vo.MerOrderTotalVo;
+import com.ruoyi.order.domain.vo.MerTotalOrderVo;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
@@ -39,7 +43,7 @@
* @param userId
* @return
*/
- List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
+ List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
@@ -48,7 +52,7 @@
* @param merOrderPageDto
* @return
*/
- List<MerOrderPageVo> pageMerOrder(Page page,@Param("param") MerOrderPageDto merOrderPageDto);
+ List<MerOrderPageVo> pageMerOrder(Page page, @Param("param") MerOrderPageDto merOrderPageDto);
/**
@@ -57,7 +61,7 @@
* @param userId
* @return
*/
- List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, @Param("userId") Long userId);
+ List<MerMemberOrderVo> pageMerMemberOrder(Page page, @Param("userId") Long userId,@Param("shopId") Long shopId);
/**
* 获取用户订单统计
@@ -92,7 +96,7 @@
* @param
* @return MgtOrderTotal
*/
- MgtOrderTotal totalOrderFirst();
+ MgtOrderTotal totalOrderFirst(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
/**
* @description 统计门店订单总数
@@ -143,6 +147,15 @@
MgtBulletinBoardVo boardOrderTotal();
/**
+ * @description 活动人数统计
+ * @author jqs
+ * @date 2023/8/3 21:12
+ * @param
+ * @return Integer
+ */
+ Integer activityUserTotal();
+
+ /**
* @description getTotalOrderTotalOrderFrom
* @param mgtBaseShopDto
* @return MgtTotalOrderTotalVo
@@ -150,6 +163,15 @@
* @date 2023/6/19 22:24
*/
MgtTotalOrderTotalVo getTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description getTotalOrderTotalGoodsType
+ * @param merTotalDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MerOrderTotalVo getMerTotalOrderTotalGoodsType(@Param("param") MerTotalDto merTotalDto);
/**
* @description getTotalOrderTotalGoodsType
@@ -421,6 +443,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
@@ -438,4 +468,167 @@
* @return BigDecimal
*/
BigDecimal getMemberUnpaidOrder(@Param("param")MerBaseDto merBaseDto);
+
+
+ /**
+ * @description getTotalOrderTotalOrderFrom
+ * @param merTotalDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MerOrderTotalVo getMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+
+ /**
+ * @description 获取各年龄层统计
+ * @author jqs
+ * @date 2023/7/4 10:27
+ * @param merTotalDto
+ * @return MgtMapTotalPlusVo
+ */
+ List<MgtMapTotalPlusVo> listMerOrderDistributionTotal(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户获取销售占比统计
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listMerOrderTotalGoodsType(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户获取销售排名
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalGoodsRank(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param merOrderPageDto
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(@Param("param")MerOrderPageDto merOrderPageDto);
+
+
+ /**
+ * @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);
+
+ /**
+ * @description 统计用户活动参与次数
+ * @author jqs
+ * @date 2023/7/13 18:27
+ * @param userId
+ * @param activityId
+ * @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