From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
index 8181d9b..18b1224 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
@@ -3,13 +3,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
-import com.mzl.flower.entity.coupon.CouponTemplateDO;
+import com.mzl.flower.entity.menber.Member;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class CouponTemplateVO extends AbstractTransDTO {
@@ -227,6 +228,38 @@
private String updateByName;
@ApiModelProperty(value = "会员等级")
- private String vipGrade;
+
+ private Integer memberId;
+
+ @ApiModelProperty(value = "会员等级名称")
+ private String memberName;
+
+
+ @ApiModelProperty(value = "商户列表")
+ List<CouponTemplateCustomerVO> customerList;
+
+
+ @ApiModelProperty(value = "会员等级对象")
+ private Member member;
+
+ @ApiModelProperty(value = "发放时间")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "优惠券图片")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "是否已经领取完成，判断最大的领取次数和已经领取次数")
+ private Integer receiveFlag;
+
+ @ApiModelProperty(value = "优惠券是否已领取")
+ private Boolean getYetFlag;
+
+ @ApiModelProperty(value = "剩余领取数量")
+ private Integer leftNum;
+
+ @ApiModelProperty(value = "优惠券领取的最早时间")
+ private LocalDateTime recordCreateTime;
}
--
Gitblit v1.9.3