From 56a7e539628f35d350532e8afcb51e39d9cd0cf9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 11:31:10 +0800
Subject: [PATCH] fix:补充花农报表
---
src/main/resources/mapper/report/OrderReportMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index e72d449..f9dc45c 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -523,6 +523,31 @@
) s group by dateinfo,supplier_id
</select>
+ <select id="getOrderSupplierReport" resultType="com.mzl.flower.dto.response.report.OrderSupplierReportResultVO">
+ select
+ dateinfo,
+ supplier_id,
+ supplierName,
+ sum(order_supplier_price_amount) order_supplier_price_amount,
+ sum(order_check_fee) order_check_fee,
+ sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
+ sum(order_num)-sum(order_lack_num) as real_sale_num,
+ sum(sales_fee_supplier) sales_fee_supplier,
+ sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier) - sum(sales_fee_supplier) profitFeeAmount
+ from(
+ SELECT
+ oi.id,vor.*,p.name as supplierName
+ FROM t_order_item oi
+ left join (<include refid="baseSupplierSql"></include>) vor
+ on oi.id =vor.order_item_id
+ left join t_supplier_info p
+ on vor.supplier_id=p.id
+ left join t_order o
+ on vor.order_id= o.id
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
+ ) s group by dateinfo,supplier_id
+ </select>
+
<select id="getOrderSupplierCountReport" resultType="com.mzl.flower.dto.response.report.OrderSupplierReportResultVO">
Select
sum(order_supplier_price_amount) order_supplier_price_amount,
@@ -541,12 +566,11 @@
sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
sum(order_num)-sum(order_lack_num) as real_sale_num,
sum(sales_fee_supplier) sales_fee_supplier,
- sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier)
- - sum(sales_fee_supplier) profitFeeAmount
+ sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier) - sum(sales_fee_supplier) profitFeeAmount
from(
SELECT
oi.id,vor.*,p.name as supplierName
- FROM t_order_item oi
+ FROM t_order_item oi
left join (<include refid="baseSupplierSql"></include>) vor
on oi.id =vor.order_item_id
left join t_supplier_info p
@@ -554,7 +578,7 @@
left join t_order o
on vor.order_id= o.id
and o.status_backend not in ('PENDING','CANCEL','REFUND')
- )
- ) s
+ ) s group by dateinfo,supplier_id
+ ) s2
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3