From 021fcaca65cc87874e216630153e17455acaabce Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 16:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/resources/mapper/report/OrderReportMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 03e9ca8..98ec9dd 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -411,6 +411,12 @@
             left join t_supplier_info si on si.id = oi.supplier_id
             left join t_order_item_settlement ois on ois.order_item_id = oi.id
             WHERE oi.deleted = 0
+            <if test="dto.startDate != null">
+                and o.payment_time &gt; #{dto.startDate}
+            </if>
+            <if test="dto.endDate != null">
+                and o.payment_time &lt;= #{dto.endDate}
+            </if>
         )t1
         where 1=1
         <if test="dto.paymentDateStart != null">
@@ -490,7 +496,7 @@
             and o.payment_time &lt;= #{dto.endDate}
         </if>
         <if test="dto.supplierId != null">
-            and oi.supplierId = #{dto.supplierId}
+            and oi.supplier_id = #{dto.supplierId}
         </if>
         ) t1
         GROUP BY

--
Gitblit v1.9.3