From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 5 ++++-
1 files changed, 4 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 1d0f7a6..a893c08 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -43,9 +43,12 @@
"JOIN ( " +
" SELECT create_by, MAX(receive_time) AS max_time " +
" FROM t_order " +
- " where receive_time is not null and DATE(receive_time) < DATE(NOW()) - INTERVAL 30 DAY" +
+ " where receive_time is not null " +
" GROUP BY create_by " +
+ " HAVING max_time < NOW() - INTERVAL 30 DAY " +
") 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();
+
+ Integer getFlowerCompleteNumToday(@Param("userId") String userId,@Param("flowerId") Long flowerId);
}
--
Gitblit v1.9.3