From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
index 987c63d..a16d0bc 100644
--- a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,12 +3,27 @@
<mapper namespace="com.mzl.flower.mapper.payment.OrderSettlementDetailMapper">
<select id="selectSettlementDetailList" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
- SELECT s.*, oi.flower_name, oi.flower_level
+ SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no, s.order_id
FROM t_order_settlement_detail s
join t_order_item oi on oi.id = s.order_item_id
+ join t_order o on o.id = s.order_id
WHERE s.deleted = 0
AND s.settlement_id = #{settlementId}
- ORDER BY s.create_time desc
+ ORDER BY o.receive_time desc, o.id, oi.flower_name
+ </select>
+
+
+ <select id="selectSettlementDetailLists" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
+ SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no, s.order_id, oi.supplier_id
+ FROM t_order_settlement_detail s
+ join t_order_item oi on oi.id = s.order_item_id
+ join t_order o on o.id = s.order_id
+ join t_order_settlement os on os.id = s.settlement_id
+ WHERE s.deleted = 0
+ and o.status = 'COMPLETED'
+ AND os.type = 'supplier'
+ AND os.status in ('PENDING','FAILED')
+ ORDER BY o.receive_time desc, o.id, oi.flower_name
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3