From 498557d0fd3b2bc14b446626cbc8a63a52fa83cb Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 04 九月 2024 12:56:02 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 8 +++++++-
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java | 8 +++++++-
2 files changed, 14 insertions(+), 2 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;
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
index bbd8d32..57870c7 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
@@ -37,9 +37,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