From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
index a91666f..8662ab6 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
@@ -34,6 +34,9 @@
@ApiModelProperty(value = "物流扣款")
private BigDecimal feePlatformTransport;
+ @ApiModelProperty(value = "打包运费")
+ private BigDecimal feePackingTransport;
+
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
@@ -46,4 +49,13 @@
@ApiModelProperty(value = "补货数量")
private Integer replaceNum;
+ @ApiModelProperty(value = "缺货数量")
+ private Integer lackNum;
+
+ @ApiModelProperty(value = "质检总扣款")
+ private BigDecimal checkTotalAmount;
+
+ @ApiModelProperty(value = "已退总金额")
+ private BigDecimal refundTotalAmount;
+
}
--
Gitblit v1.9.3