From 6d943721ed2c41de272450143d6e204e7c4bc446 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 13:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index bf47555..5a29bcd 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,12 +71,16 @@
, oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
, o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
, o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
- , si.remarks
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
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