From c83b580b0f51a2cdf16f2b1537aa3cb113ef112f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 20 十二月 2024 17:56:10 +0800
Subject: [PATCH] add: 花材销售统计商品分类
---
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
index ad5158e..a16d0bc 100644
--- a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,7 +3,7 @@
<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, o.receive_time, oi.check_time
+ 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
@@ -12,4 +12,18 @@
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