From c28b679fb769c7f0b5a462b7effeae5e25798534 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 06 九月 2024 16:58:29 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 8f9210e..5b64837 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
@@ -9,6 +9,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class OrderDTO extends AbstractTransDTO {
@@ -135,4 +136,30 @@
@ApiModelProperty(value = "支付单号")
private String paymentTrId;
+
+ @ApiModelProperty(value = "积分商品列表")
+ private List<OrderPointGoodsListDTO> pointGoodsList;
+
+ @ApiModelProperty(value = "优惠券编码")
+ private String memberCouponCode;
+
+ @ApiModelProperty(value = "优惠券名称")
+ private String memberCouponName;
+
+ @ApiModelProperty(value = "优惠券金额")
+ private BigDecimal memberCouponAmount;
+
+ @ApiModelProperty(value = "会员等级名称")
+ 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;
}
--
Gitblit v1.9.3