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/coupon/CouponTemplateVO.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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..51e5f84 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,23 @@ 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; } -- Gitblit v1.9.3