From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期三, 08 一月 2025 15:26:06 +0800 Subject: [PATCH] 1.订单提交:订单最小金额配置 --- 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