From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期四, 05 九月 2024 17:16:16 +0800 Subject: [PATCH] Merge branch 'master' into master-v2 --- src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java index 96d57a3..1e25aea 100644 --- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java +++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java @@ -87,4 +87,49 @@ + /** + * 领取后有效类型（COUPON_usage_time_type）天、小时、分钟 + */ + @ApiModelProperty(value = "领取后有效类型（COUPON_USAGE_TIME_TYPE）") + @DictTrans(target = "usageTimeTypeName",codeType = "COUPON_USAGE_TIME_TYPE") + private String usageTimeType; + + /** + * 领取后有效时间整数，比如90（天，小时，分钟） + */ + @ApiModelProperty(value = "领取后有效时间整数") + private Integer usageTimeNum; + + @ApiModelProperty(value = "使用时间类型（COUPON_USAGE_TYPE）") + @DictTrans(target = "usageTypeName",codeType = "COUPON_USAGE_TYPE") + private String usageType; + + @ApiModelProperty(value = "使用时间类型") + private String usageTypeName; + + @ApiModelProperty(value = "领取后有效类型名称") + private String usageTimeTypeName; + + @ApiModelProperty(value = "领取渠道（COUPON_GET_TYPE）") + @DictTrans(target = "getTypeName",codeType = "COUPON_GET_TYPE") + private String getType; + + /** + * 领取渠道（COUPON_GET_TYPE）首页弹窗、活动入口、领券中心 + */ + @ApiModelProperty(value = "领取渠道（COUPON_GET_TYPE）") + private String getTypeName; + + /** + * 每人限领 + */ + @ApiModelProperty(value = "每人限领") + private Integer getLimit; + + @ApiModelProperty(value = "发放时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") + @DateTimeFormat + private LocalDateTime createTime; + + } -- Gitblit v1.9.3