From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'

---
 src/main/resources/mapper/payment/OrderItemSalesMapper.xml |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 6b0d827..eef9518 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, oi.supplier_price, oi.markup_partner, si.audit_time
+            , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type
         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 &gt;= #{condition.createStartDate}
+            AND oi.create_time &gt;= #{condition.orderStartDate}
         </if>
         <if test="condition.orderEndDate != null">
-            AND oi.create_time &lt;= #{condition.createEndDate}
+            AND oi.create_time &lt;= #{condition.orderEndDate}
         </if>
 
         <if test="condition.salesStartDate != null">
-            AND si.create_time &gt;= #{condition.createStartDate}
+            AND si.create_time &gt;= #{condition.salesStartDate}
         </if>
         <if test="condition.salesEndDate != null">
-            AND si.create_time &lt;= #{condition.createEndDate}
+            AND si.create_time &lt;= #{condition.salesEndDate}
         </if>
 
         <if test="condition.status != null and condition.status != ''">
@@ -132,6 +136,12 @@
         <if test="condition.supplierId != null">
             AND oi.supplier_id = #{condition.supplierId}
         </if>
+        <if test="condition.supplierId != null">
+            AND oi.supplier_id = #{condition.supplierId}
+        </if>
+        <if test="condition.salesType != null">
+            AND si.sales_type = #{condition.salesType}
+        </if>
 
         ORDER BY si.create_time desc
     </select>

--
Gitblit v1.9.3