From 272188e47087a8ef92eb0a48b122fa1c73ea94d3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java |    3 ++-
 1 files changed, 2 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..6dd5dc4 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,6 @@
             "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);
 }

--
Gitblit v1.9.3