From 5ff8fb8bd9d298def47437b24e77c8879cdc37d2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:36:39 +0800
Subject: [PATCH] 1.定时任务-待付款-15分钟 2.领券中心：根据领取次数判断是否已领取 3.付款：优惠券自动领取最大优惠券
---
src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java | 9 ++++++++-
1 files changed, 8 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 67d0d73..260211a 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;
@@ -74,7 +77,11 @@
@ApiModelProperty("总包干费")
private BigDecimal partnerTotalFeeAmount;
- @ApiModelProperty("销售扎数")
+
+ @ApiModelProperty("总销售扎数")
+ private Integer orderNum;
+
+ @ApiModelProperty("实际销售扎数")
private Integer realSaleNum;
@ApiModelProperty("利润")
--
Gitblit v1.9.3