From 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 26 十二月 2024 17:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 7c82985..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
@@ -40,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;
@@ -55,6 +62,9 @@
@ApiModelProperty("补货扣款")
private BigDecimal orderReplaceFee;
+ @ApiModelProperty("售后总扣款")
+ private BigDecimal orderTotalFee;
+
@ApiModelProperty("售后扣合伙人款")
private BigDecimal orderFeePartner;
@@ -64,6 +74,19 @@
@ApiModelProperty("售后扣平台款")
private BigDecimal orderFeePlatform;
+ @ApiModelProperty("售后打包扣款")
+ private BigDecimal orderFeePlatformPack;
+
+ @ApiModelProperty("售后质检扣款")
+ private BigDecimal orderFeePlatformCheck;
+
+ @ApiModelProperty("售后物流扣款")
+ private BigDecimal orderFeePlatformTransport;
+
+ @ApiModelProperty("售后打包运费扣款")
+ private BigDecimal orderFeePackingTransport;
+
+
@ApiModelProperty("总包干费--暂无")
private BigDecimal partnerTotalFeeAmount;
--
Gitblit v1.9.3