From ead65cd9b15cd574f4e37c3376c7447efea53935 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 4 ++++
1 files changed, 4 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..7ae63c5 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,15 @@
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;
}
--
Gitblit v1.9.3