From af085dd2fdea97c66ed9520f31754e1025d9dc02 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期二, 10 十二月 2024 16:06:58 +0800 Subject: [PATCH] 582-在售商品可以直接进行删除,需要进行优化,在售商品删除提示无法删除,需要先进行下架再进行删除 --- 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