From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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..71273f4 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;
@@ -37,11 +40,18 @@
@ApiModelProperty("合伙人区间加价--暂无")
private BigDecimal partnerSectionFeeAmount;
+
+ @ApiModelProperty("优惠合计")
+ private BigDecimal orderDiscountTotalFee;
+
@ApiModelProperty("会员折扣")
private BigDecimal orderPriceDiscountAmount;
@ApiModelProperty("优惠券")
private BigDecimal orderCouponAmountTotal;
+
+ @ApiModelProperty("质检总扣款")
+ private BigDecimal orderCheckTotalFee;
@ApiModelProperty("降级扣款")
private BigDecimal orderCheckFee;
@@ -52,6 +62,9 @@
@ApiModelProperty("补货扣款")
private BigDecimal orderReplaceFee;
+ @ApiModelProperty("售后总扣款")
+ private BigDecimal orderTotalFee;
+
@ApiModelProperty("售后扣合伙人款")
private BigDecimal orderFeePartner;
@@ -61,12 +74,37 @@
@ApiModelProperty("售后扣平台款")
private BigDecimal orderFeePlatform;
+ @ApiModelProperty("售后打包扣款")
+ private BigDecimal orderFeePlatformPack;
+
+ @ApiModelProperty("售后质检扣款")
+ private BigDecimal orderFeePlatformCheck;
+
+ @ApiModelProperty("售后物流扣款")
+ private BigDecimal orderFeePlatformTransport;
+
+ @ApiModelProperty("售后打包运费扣款")
+ private BigDecimal orderFeePackingTransport;
+
+
@ApiModelProperty("总包干费--暂无")
private BigDecimal partnerTotalFeeAmount;
+ @ApiModelProperty("总销售扎数")
+ private Integer orderNum;
+
@ApiModelProperty("实际销售扎数")
private Integer realSaleNum;
+ @ApiModelProperty("缺货扎数")
+ private BigDecimal orderLackNum;
+
+ @ApiModelProperty("降级扎数")
+ private BigDecimal orderReduceNum;
+
+ @ApiModelProperty("补货扎数")
+ private BigDecimal orderReplaceNum;
+
@ApiModelProperty("利润--总包干费没有无法计算")
private BigDecimal profitFeeAmount;
--
Gitblit v1.9.3