From 4432a5b67bcb38802bb10ff015762d4f81d6f484 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 11:09:42 +0800
Subject: [PATCH] fix:补充花农报表
---
src/main/resources/mapper/report/OrderReportMapper.xml | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index f9dc45c..4c5d1b7 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -508,13 +508,15 @@
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,
+ case when COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END) = 0 Then '已完成' Else '进行中' end as settleStatus
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
+ oi.id,vor.*,p.name as supplierName,o.status_backend
+ FROM
+ (<include refid="baseSupplierSql"></include>) vor
+ left join t_order_item oi
+ on vor.order_item_id = oi.id
left join t_supplier_info p
on vor.supplier_id=p.id
left join t_order o
@@ -533,13 +535,15 @@
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,
+ case when COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END) = 0 Then '已完成' Else '进行中' end as settleStatus
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
+ oi.id,vor.*,p.name as supplierName,o.status_backend
+ FROM
+ (<include refid="baseSupplierSql"></include>) vor
+ left join t_order_item oi
+ on vor.order_item_id = oi.id
left join t_supplier_info p
on vor.supplier_id=p.id
left join t_order o
@@ -570,9 +574,10 @@
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
+ FROM
+ (<include refid="baseSupplierSql"></include>) vor
+ left join t_order_item oi
+ on vor.order_item_id = oi.id
left join t_supplier_info p
on vor.supplier_id=p.id
left join t_order o
--
Gitblit v1.9.3