From a339c9b8617163ab705f64d59ef261fc7700f23f Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期三, 11 九月 2024 08:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
index b526e43..167c3ee 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
@@ -25,9 +25,15 @@
@ApiModelProperty(value = "结算合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "质检扣款")
+ @ApiModelProperty(value = "降级扣款")
private BigDecimal checkFee;
+ @ApiModelProperty(value = "缺货扣款")
+ private BigDecimal lackFee;
+
+ @ApiModelProperty(value = "补货扣款")
+ private BigDecimal replaceFee;
+
@ApiModelProperty(value = "集货站运费")
private BigDecimal stationFee;
--
Gitblit v1.9.3