From 9e710473223b9cb94d1da9d58499671bffc1863d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 19 九月 2024 15:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
index 987c63d..4521617 100644
--- a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,12 +3,13 @@
<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
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3