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/OrderDTO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
index 5b64837..b2a330e 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
@@ -162,4 +162,14 @@
@ApiModelProperty(value = "优惠金额（每扎）")
private BigDecimal memberDiscountAmount;
+
+ private List<OrderItemListDTO> items;
+
+ @ApiModelProperty(value = "优惠券类型（discount_type）")
+ @DictTrans(target = "couponDiscountTypeName",codeType = "COUPON_TYPE")
+ private String couponDiscountType;
+ private String couponDiscountTypeName;
+
+ @ApiModelProperty(value = " 使用条件（满多少钱）")
+ private String minOrderAmount;
}
--
Gitblit v1.9.3