From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 5ef7bb0..df08bcb 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -60,10 +60,10 @@
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
         <if test="startDate != null">
-            AND q.create_time &gt; #{startDate}
+            AND o.payment_time &gt; #{startDate}
         </if>
         <if test="endDate != null">
-            AND q.create_time &lt;= #{endDate}
+            AND o.payment_time &lt;= #{endDate}
         </if>
         order by q.create_time desc, oi.flower_name, oi.flower_level
     </select>

--
Gitblit v1.9.3