From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 十二月 2024 18:15:44 +0800
Subject: [PATCH] fix:合伙人列表操作日志

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

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 31673f2..54a0077 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -31,40 +31,48 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o ON q.order_id = o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND q.create_time &lt;= #{endDate}-->
+<!--        </if>-->
         <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>
         group by oi.flower_name, oi.flower_level
     </select>
 
     <select id="selectSettlementListByTime"
             resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
-        SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
+        SELECT oi.id orderItemId, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price
         , ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
         , ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
         , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
         , (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
+        , (select s.`status` from t_order_settlement_detail sd, t_order_settlement s
+            where sd.order_item_id = oi.id
+            and sd.settlement_id = s.id and s.type = 'supplier') status
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order o on o.id = q.order_id
         join t_order_item oi on oi.id = doi.order_item_id
         left join t_order_item_settlement ois on ois.order_item_id = oi.id
-        left join t_order_settlement_detail sd on sd.order_item_id = oi.id
-        left join t_order_settlement s on sd.settlement_id = s.id
         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"
@@ -73,13 +81,20 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o on oi.order_id=o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND q.create_time &lt;= #{endDate}-->
+<!--        </if>-->
         <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>
     </select>
 
@@ -88,16 +103,23 @@
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
+        JOIN t_order o on oi.order_id=o.id
         WHERE q.deleted = 0 and doi.deleted = 0
         and q.supplier_id = #{supplierId}
+<!--        <if test="status != null and status != ''">-->
+<!--            AND q.status = #{status}-->
+<!--        </if>-->
+<!--        <if test="startDate != null">-->
+<!--            AND q.create_time &gt; #{startDate}-->
+<!--        </if>-->
         <if test="status != null and status != ''">
             AND q.status = #{status}
         </if>
         <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>
     </select>
 

--
Gitblit v1.9.3