From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +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 | 15 +++++++++++++++
1 files changed, 15 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 2434cb3..9727003 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
@@ -153,11 +153,26 @@
private String memberName;
@ApiModelProperty(value = "折扣类型（discount_type）")
+ @DictTrans(target = "memberDiscountTypeStr", codeType = "DISCOUNT_TYPE")
private String memberDiscountType;
+ private String memberDiscountTypeStr;
@ApiModelProperty(value = "会员折扣")
private BigDecimal memberDiscountRatio;
@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;
+
+ @ApiModelProperty(value = "快递单号")
+ private String deliveryNo;
}
--
Gitblit v1.9.3