From 9615ef3023e1a60d202e86178003a2b864191106 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:10:00 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 6564b6e..4fffd79 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
@@ -13,11 +13,14 @@
@ApiModelProperty("下单日期")
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
- @DateTimeFormat
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private LocalDateTime orderDate;
@ApiModelProperty("销售额")
private BigDecimal orderTotal;
+
+ @ApiModelProperty("销售合计（实付）")
+ private BigDecimal totalAmount;
@ApiModelProperty("花农底价")
private BigDecimal orderSupplierPriceAmount;
@@ -64,6 +67,9 @@
@ApiModelProperty("总包干费--暂无")
private BigDecimal partnerTotalFeeAmount;
+ @ApiModelProperty("总销售扎数")
+ private Integer orderNum;
+
@ApiModelProperty("实际销售扎数")
private Integer realSaleNum;
--
Gitblit v1.9.3