From f03fd9baf8163a4429133a41a183d28abc9e66fd Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 11:39:12 +0800
Subject: [PATCH] add:阿里云短信模板获取签名和模板信息5

---
 src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 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 290900a..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,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