From 0f148ab371926582eeb2774904af5de6dc9e5761 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 16:32:42 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..715debd 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,31 @@
"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();
+
+ 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);
+
+
+ @Select("SELECT si.contact_tel " +
+ "FROM t_supplier_info si " +
+ "WHERE si.id IN ( " +
+ " SELECT oi.supplier_id " +
+ " FROM t_order_item oi " +
+ " JOIN t_order q ON oi.order_id = q.id " +
+ " WHERE q.deleted = 0 " +
+ " AND q.status_backend = #{Status} " +
+ " AND q.payment_time >= #{startTime} " +
+ " AND q.payment_time <= #{endTime} " +
+ " GROUP BY oi.supplier_id " +
+ ")")
+ List<String> getWaitSendMessageInfoBySupplier(String Status, LocalDateTime startTime, LocalDateTime endTime);
+
}
--
Gitblit v1.9.3