From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 7c44d31..ec510dc 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -49,4 +49,10 @@
") t2 ON t1.create_by = t2.create_by AND t1.receive_time = t2.max_time " +
"LEFT JOIN t_customer_info c ON t1.create_by = c.user_id ")
List<Order> getOrderInfoByReceiveTime();
+
+ 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