From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计，将原销售扎数改成实际销售扎数

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

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 73835a2..df08bcb 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -60,12 +60,12 @@
         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
+        order by q.create_time desc, oi.flower_name, oi.flower_level
     </select>
 
     <select id="getSupplierStatisticsByTime"

--
Gitblit v1.9.3