From 9615ef3023e1a60d202e86178003a2b864191106 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:10:00 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 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