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/report/OrderReportMapper.xml | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index f58f1ae..affc3b6 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -216,6 +216,7 @@
IFNULL(sum(order_markup_partner_amount),0) as order_markup_partner_amount,
IFNULL(sum(order_price_discount_amount),0) as order_price_discount_amount,
IFNULL(sum(order_coupon_amount_total),0) as order_coupon_amount_total,
+ IFNULL(sum(order_check_fee)+sum(order_lack_fee_supplier)+sum(order_replace_fee),0) as order_check_total_fee,
IFNULL(sum(order_check_fee),0) as order_check_fee,
IFNULL(sum(order_lack_fee_supplier),0) as order_lack_fee_supplier,
IFNULL(sum(order_replace_fee),0) as order_replace_fee,
@@ -265,6 +266,8 @@
<sql id="baseSql">
select t2.*,
+ IFNULL(t2.order_check_fee+t2.order_lack_fee_supplier+t2.order_replace_fee,0) as order_check_total_fee,
+ IFNULL(t2.order_price_discount_amount+t2.order_coupon_amount_total,0) as order_discount_total_fee,
IFNULL(t3.fee_supplier,0) as order_fee_supplier,
IFNULL(t3.fee_partner,0) as order_fee_partner,
IFNULL(t3.fee_platform,0) as order_fee_platform,
@@ -277,8 +280,19 @@
select
t1.order_id, t1.total_amount ,sum(t1.num) as order_num ,
( sum( t1.supplier_price_amount )+sum( t1.markup_one_amount )+sum( t1.markup_two_amount )+sum( t1.markup_partner_amount ) + t1.packing_fee + t1.transport_fee ) AS order_total,
- sum(t1.supplier_price_amount) as order_supplier_price_amount, sum(t1.markup_one_amount) as order_markup_one_amount,sum(t1.markup_two_amount) as order_markup_two_amount, sum(t1.markup_partner_amount) as order_markup_partner_amount,sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,sum(t1.price_discount_amount) as order_price_discount_amount,sum(t1.coupon_amount_total) as order_coupon_amount_total,sum(t1.check_fee) as order_check_fee,sum(t1.lack_fee_supplier) as order_lack_fee_supplier,sum(t1.replace_fee) as order_replace_fee,
- sum(replace_num) as order_replace_num,sum(reduce_num) as order_reduce_num,sum(lack_num) as order_lack_num
+ sum(t1.supplier_price_amount) as order_supplier_price_amount,
+ sum(t1.markup_one_amount) as order_markup_one_amount,
+ sum(t1.markup_two_amount) as order_markup_two_amount,
+ sum(t1.markup_partner_amount) as order_markup_partner_amount,
+ sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,
+ sum(t1.price_discount_amount) as order_price_discount_amount,
+ sum(t1.coupon_amount_total) as order_coupon_amount_total,
+ sum(t1.check_fee) as order_check_fee,
+ sum(t1.lack_fee_supplier) as order_lack_fee_supplier,
+ sum(t1.replace_fee) as order_replace_fee,
+ sum(replace_num) as order_replace_num,
+ sum(reduce_num) as order_reduce_num,
+ sum(lack_num) as order_lack_num
from (
SELECT
o.total_amount, o.flower_amount, o.packing_fee, o.transport_fee,
@@ -467,7 +481,9 @@
sum( t1.replace_fee ) AS order_replace_fee,
sum( t1.lack_fee_supplier ) AS order_lack_fee_supplier,
sum( t1.num ) AS order_num,
- sum( t1.lack_num ) AS order_lack_num
+ sum( t1.lack_num ) AS order_lack_num,
+ sum( t1.reduce_num ) AS order_reduce_num,
+ sum( t1.replace_num ) AS order_replace_num
FROM
(
SELECT
@@ -483,8 +499,11 @@
IFNULL( oi.supplier_price, 0 ) * IFNULL( oi.num, 0 ) AS supplier_price_amount,
IFNULL( ois.check_fee, 0 ) AS check_fee,
IFNULL( ois.replace_fee, 0 ) AS replace_fee,
- IFNULL( ois.lack_fee_supplier, 0 ) AS lack_fee_supplier,
- IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
+ IFNULL( ois.lack_fee_supplier, 0 ) AS lack_fee_supplier
+
+ ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace' and oic.audit_status='AGREED'),0) as replace_num
+ ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status='AGREED'),0) as reduce_num
+ ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
FROM
t_order o
LEFT JOIN t_order_item oi ON oi.order_id = o.id
@@ -518,7 +537,11 @@
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) as order_num,
sum(order_num)-sum(order_lack_num) as real_sale_num,
+ sum(order_lack_num) as order_lack_num,
+ sum(order_reduce_num ) AS order_reduce_num,
+ sum(order_replace_num ) AS order_replace_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,
case when COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END) = 0 Then '已完成' Else '进行中' end as settleStatus
@@ -545,7 +568,11 @@
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) as order_num,
sum(order_num)-sum(order_lack_num) as real_sale_num,
+ sum(order_lack_num) as order_lack_num,
+ sum(order_reduce_num ) AS order_reduce_num,
+ sum(order_replace_num ) AS order_replace_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,
case when COUNT(CASE WHEN status_backend ='COMPLETED' THEN NULL ELSE 1 END) = 0 Then '已完成' Else '进行中' end as settleStatus
--
Gitblit v1.9.3