From 039dbb9ab16f295e91cfcdea5bf68bf16bc0417e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:22:33 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 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 c1e4e85..2070d2d 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
@@ -37,7 +37,7 @@
/**
* 收银未结清订单列表
* @param page
- * @param userId
+ * @param pageMerMemberNoClearOrder
* @return
*/
List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("param") MerMemberNoClearOrderDto pageMerMemberNoClearOrder);
@@ -141,7 +141,7 @@
* @author jqs34
* @date 2023/6/18 17:20
*/
- MgtBulletinBoardVo boardOrderTotal();
+ MgtBulletinBoardVo boardOrderTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description 活动人数统计
@@ -150,7 +150,7 @@
* @param
* @return Integer
*/
- Integer activityUserTotal();
+ Integer activityUserTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description getTotalOrderTotalOrderFrom
@@ -662,11 +662,10 @@
* @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);
+ Integer countUserBuyGoodsNum(@Param("goodsId")String goodsId);
/**
@@ -713,4 +712,28 @@
* @return MerMemberSimpleTotalVo
*/
MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(@Param("param") MerBaseDto merBaseDto);
+
+ /**
+ * 查询第三方订单
+ * @param page
+ * @param dto
+ * @return
+ */
+ List<MgtThirdOrderPageVo> pageMgtThirdOrder(Page<MgtThirdOrderPageVo> page,@Param("param") MgtThirdOrderPageDto dto);
+
+ /**
+ * 统计三方订单
+ * @param mgtBasePlatformDto
+ * @return
+ */
+ MgtPlTotalThirdOrderStaticsVO getPlTotalThirdOrderStatics(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 统计第三方订单总数
+ * @author jqs
+ * @date 2023/6/16 13:53
+ * @param mgtShopOrderPageDto
+ * @return MgtOrderTotal
+ */
+ MgtOrderTotal totalOrderFour(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
}
--
Gitblit v1.7.1