From 9c6e78ea55ef4c865b8148a5ca47322504ed1f50 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期六, 31 八月 2024 20:09:49 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 6b0d827..5a29bcd 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -77,6 +77,10 @@
join t_order o on si.order_id = o.id
left join t_station s on s.id = oi.station_id
WHERE oi.deleted = 0
+ <if test="condition.orderItemId != null and condition.orderItemId != ''">
+ AND si.order_item_id = #{condition.orderItemId}
+ </if>
+
<if test="condition.orderId != null and condition.orderId != ''">
AND si.order_id = #{condition.orderId}
</if>
@@ -106,17 +110,17 @@
</if>
<if test="condition.orderStartDate != null">
- AND oi.create_time >= #{condition.createStartDate}
+ AND oi.create_time >= #{condition.orderStartDate}
</if>
<if test="condition.orderEndDate != null">
- AND oi.create_time <= #{condition.createEndDate}
+ AND oi.create_time <= #{condition.orderEndDate}
</if>
<if test="condition.salesStartDate != null">
- AND si.create_time >= #{condition.createStartDate}
+ AND si.create_time >= #{condition.salesStartDate}
</if>
<if test="condition.salesEndDate != null">
- AND si.create_time <= #{condition.createEndDate}
+ AND si.create_time <= #{condition.salesEndDate}
</if>
<if test="condition.status != null and condition.status != ''">
--
Gitblit v1.9.3