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/OrderDetailReportResultVO.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 1341b16..2e162e0 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
@@ -50,11 +50,17 @@
@ApiModelProperty("合伙人区间加价")
private BigDecimal partnerSectionFeeAmount;
+ @ApiModelProperty("优惠合计")
+ private BigDecimal orderDiscountTotalFee;
+
@ApiModelProperty("会员折扣")
private BigDecimal orderPriceDiscountAmount;
@ApiModelProperty("优惠券")
private BigDecimal orderCouponAmountTotal;
+
+ @ApiModelProperty("质检总扣款")
+ private BigDecimal orderCheckTotalFee;
@ApiModelProperty("质检降级扣款")
private BigDecimal orderCheckFee;
@@ -65,6 +71,10 @@
@ApiModelProperty("质检补货扣款")
private BigDecimal orderReplaceFee;
+
+ @ApiModelProperty("售后总扣款")
+ private BigDecimal orderTotalFee;
+
@ApiModelProperty("售后扣合伙人款")
private BigDecimal orderFeePartner;
@@ -74,12 +84,38 @@
@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("销售扎数")
+
+ @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