From 0030edda8dddc17162fcba92aed4d215bd874859 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 17:44:02 +0800
Subject: [PATCH] 分账
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 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 fba7330..df55dd7 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;
@@ -61,7 +58,7 @@
* @param userId
* @return
*/
- List<MerMemberOrderVo> pageMerMemberOrder(Page page, @Param("userId") Long userId);
+ List<MerMemberOrderVo> pageMerMemberOrder(Page page, @Param("userId") Long userId,@Param("shopId") Long shopId);
/**
* 获取用户订单统计
@@ -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
@@ -444,6 +450,17 @@
/**
* @description
+ * @author jqs
+ * @date 2023/6/25 17:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopServiceTotalVo(Long shopId);
+
+
+
+ /**
+ * @description
* @author cheny
* @param shopIds
* @return MerHomeShopTotalVo
@@ -556,6 +573,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
@@ -570,10 +597,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);
/**
@@ -631,4 +658,22 @@
* @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);
}
--
Gitblit v1.7.1