From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
index a893c08..ec510dc 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -50,5 +50,9 @@
"LEFT JOIN t_customer_info c ON t1.create_by = c.user_id ")
List<Order> getOrderInfoByReceiveTime();
- Integer getFlowerCompleteNumToday(@Param("userId") String userId,@Param("flowerId") Long flowerId);
+ int getFlowerCompleteNumWithinTimeRange(@Param("userId") String userId ,@Param("flowerId") Long flowerId,
+ @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+
+ List<OrderListExportDTO> selectOrderExportList(@Param("condition") OrderQueryDTO dto);
+
}
--
Gitblit v1.9.3