From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 21 ++++++++++++++++++++-
1 files changed, 20 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..715debd 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,24 @@
"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);
+
+
+ @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