From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 67be37c..903558a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -35,7 +35,7 @@
List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo, @Param("item") OrderPageList orderPageList);
OrderStatistics getOrderStatistics(@Param("startTime")String startTime,
- @Param("endTime") String endTime);
+ @Param("endTime") String endTime, @Param("shopId") Integer shopId);
/**
@@ -43,7 +43,9 @@
* @param goodsId
* @return
*/
- Integer getGoodsSaleNum(@Param("goodsId") Integer goodsId, @Param("type") Integer type);
+ Integer getGoodsSaleNum(@Param("goodsId") Integer goodsId,
+ @Param("type") Integer type,
+ @Param("userId") Long userId);
/**
--
Gitblit v1.7.1