From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:51:21 +0800
Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间,自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间,自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数

---
 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