From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/PreOrderDTO.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/PreOrderDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/PreOrderDTO.java
index fde99f8..48ba6dc 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/PreOrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/PreOrderDTO.java
@@ -19,7 +19,25 @@
@ApiModelProperty(value = "商品总金额")
private BigDecimal totalAmount;
+ @ApiModelProperty(value = "商品会员价总金额")
+ private BigDecimal totalMemberAmount;
+
@ApiModelProperty(value = "打包费")
private BigDecimal packing;
+ @ApiModelProperty(value = "会员等级id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "会员等级名称")
+ private String memberName;
+
+ @ApiModelProperty(value = "折扣类型（discount_type）")
+ private String memberDiscountType;
+
+ @ApiModelProperty(value = "会员折扣")
+ private BigDecimal memberDiscountRatio;
+
+ @ApiModelProperty(value = "优惠金额（每扎）")
+ private BigDecimal memberDiscountAmount;
+
}
--
Gitblit v1.9.3