From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 3 +++
src/main/resources/mapper/report/OrderReportMapper.xml | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
index 0839330..290900a 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
@@ -19,6 +19,9 @@
@ApiModelProperty("销售额")
private BigDecimal orderTotal;
+ @ApiModelProperty("销售合计（实付）")
+ private BigDecimal totalAmount;
+
@ApiModelProperty("花农底价")
private BigDecimal orderSupplierPriceAmount;
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 93ffbf0..64045e7 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -5,6 +5,7 @@
<select id="getOrderDateReport" resultType="com.mzl.flower.dto.response.report.OrderReportResultVO">
select
sum(order_total) as order_total,
+ sum(total_amount) as total_amount,
sum(order_supplier_price_amount) as order_supplier_price_amount,
sum(order_markup_one_amount) as order_markup_one_amount,
sum(order_markup_two_amount) as order_markup_two_amount,
@@ -16,7 +17,7 @@
sum(order_replace_fee) as order_replace_fee,
sum(order_fee_supplier) as order_fee_supplier,
sum(order_fee_partner) as order_fee_partner,
- sum(order_fee_platform) as order_fee_platform,
+ sum(order_fee_platform) + sum(order_fee_packing_transport) as order_fee_platform,
sum(order_fee_platform_pack) as order_fee_platform_pack,
sum(order_fee_platform_check) as order_fee_platform_check,
sum(order_fee_platform_transport) as order_fee_platform_transport,
@@ -271,10 +272,11 @@
IFNULL(t3.fee_packing_transport,0) as order_fee_packing_transport
from (
select
- t1.order_id,sum(t1.num) as order_num , sum(t1.total) 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,
+ t1.order_id, t1.total_amount ,sum(t1.num) as order_num , (t1.flower_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
from (
SELECT
+ o.total_amount, o.flower_amount, o.packing_fee, o.transport_fee,
oi.order_id,
oi.id,
IFNULL(oi.num,0) as num,
--
Gitblit v1.9.3