From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 18:53:40 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 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 5dd34f9..331ec33 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
@@ -10,10 +10,7 @@
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;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+import com.ruoyi.system.api.domain.vo.*;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
@@ -279,6 +276,15 @@
/**
* @description
* @author jqs
+ * @date 2023/6/20 15:50
+ * @param mgtBaseShopDto
+ * @return MgtTotalDataTotalVo
+ */
+ MgtTotalDataTotalVo getTotalDataMemberTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
* @date 2023/6/20 18:16
* @param
* @return Integer
@@ -367,6 +373,24 @@
* @return MgtTotalActivityTotalVo
*/
MgtPlTotalActivityTotalVo getPlTotalActivityTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 活动获客人数
+ * @author jqs
+ * @date 2023/8/26 16:07
+ * @param mgtBasePlatformDto
+ * @return MgtPlTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityMemberTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 活动获客人数
+ * @author jqs
+ * @date 2023/8/26 16:07
+ * @param mgtBaseShopDto
+ * @return getTotalActivityMemberTotal
+ */
+ MgtTotalActivityTotalVo getTotalActivityMemberTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
@@ -567,6 +591,16 @@
*/
StaffActivityOrderTotalVo getStaffActivityOrderTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端活动订单统计
+ * @author jqs
+ * @date 2023/7/17 15:25
+ * @param staffTotalDto
+ * @return StaffActivityOrderTotalVo
+ */
+ StaffActivityOrderTotalVo getStaffActivityOrderGoodsTotal(@Param("param")StaffTotalDto staffTotalDto);
+
/**
* @description 员工端活动统计
* @author jqs
@@ -581,10 +615,10 @@
* @description 获取各年龄层统计
* @author jqs
* @date 2023/7/4 10:27
- * @param userIdList
+ * @param staffTotalDto
* @return MgtMapTotalPlusVo
*/
- MgtMapTotalPlusVo listStaffActivityOrderDistributionTotal(@Param("userIdList")List<Long> userIdList,@Param("shopId")Long shopId,@Param("activityId")String activityId);
+ List<MgtMapTotalPlusVo> listStaffActivityOrderDistributionTotal(@Param("param")StaffTotalDto staffTotalDto);
/**
@@ -606,6 +640,9 @@
*/
List<MgtMapIntTotalVo> getStaffActivityGetMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ List<MgtMapIntTotalVo> getMgtActivityGetMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
/**
* @description 员工端获取活动获客人数
* @author jqs
@@ -614,6 +651,12 @@
* @return List<MgtMapIntTotalVo>
*/
List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+
+ List<MgtMapIntTotalVo> getMgtActivityMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ List<MgtMapIntTotalVo> getActivityMemberTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
/**
* @description 获取用户商品购买数量
@@ -642,4 +685,32 @@
* @return
*/
List<MerOrderPageVo> pageMerMemberPayOrder(Page page,@Param("param") MerMemberNoClearOrderDto merOrderPageDto);
+
+ /**
+ * @description 获取销售排行
+ * @author jqs
+ * @date 2023/8/24 18:00
+ * @param shopIdList
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapBigTotalVo> shopSalesRank(@Param("shopIdList")List<Long> shopIdList);
+
+ /**
+ * @description 获取区域统计
+ * @author jqs
+ * @date 2023/8/25 11:49
+ * @param shopIdList
+ * @return AgencyTotalVo
+ */
+ AgencyTotalVo getAgencyTotalVo(@Param("shopIdList")List<Long> shopIdList);
+
+
+ /**
+ * @description 商户端会员订单统计
+ * @author jqs
+ * @date 2023/8/29 17:39
+ * @param merBaseDto
+ * @return MerMemberSimpleTotalVo
+ */
+ MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(@Param("param") MerBaseDto merBaseDto);
}
--
Gitblit v1.7.1