From 5cf3e3979d922b855c667afb9f91da7d68a5d057 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 25 八月 2024 22:09:23 +0800
Subject: [PATCH] 我的配送单结算明细 调整
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 845827f..82f2983 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -39,13 +39,15 @@
</select>
<select id="selectSettlementListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
- SELECT oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price
- , s.`status`, sd.check_fee, sd.station_fee, sd.sales_fee, s.service_fee_rate
+ SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
+ , 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
, o.status_backend, o.create_time orderTime
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
--
Gitblit v1.9.3