From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 14:43:59 +0800
Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券，发布的时候将已经发布的设置为下架，只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取，超过领取优惠券的话则不返回数据
---
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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..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
@@ -139,4 +139,29 @@
@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;
}
--
Gitblit v1.9.3