From 737f2a5843bfafec2ee861f434c2977d1ec21d21 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 15 十月 2024 15:37:31 +0800
Subject: [PATCH] Revert "1.1"

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 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 207a25d..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
@@ -139,4 +139,37 @@
 
     @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;
+
+    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