From e86890b91f4f579dcac93a90a976c3133c11806e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 18 十月 2024 15:58:41 +0800
Subject: [PATCH] fix：报表统计
---
src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java | 3 +++
src/main/resources/mapper/report/OrderReportMapper.xml | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
index 67d0d73..1341b16 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
@@ -29,6 +29,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 9fee255..783a239 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -17,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) + sum(order_fee_packing_transport) as order_fee_platform,
+ sum(order_fee_platform) 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,
@@ -264,7 +264,7 @@
select t2.*,
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,
+ IFNULL(t3.fee_platform,0) + IFNULL(t3.fee_packing_transport,0) as order_fee_platform,
IFNULL(t3.fee_platform_pack,0) as order_fee_platform_pack,
IFNULL(t3.fee_platform_check,0) as order_fee_platform_check,
IFNULL(t3.fee_platform_transport,0) as order_fee_platform_transport,
--
Gitblit v1.9.3