From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
index 46d75e6..99a9802 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
@@ -3,7 +3,6 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -131,4 +130,50 @@
@ApiModelProperty(value = "未领取数")
private Integer unGetNum;
+
+ /**
+ * 领取后有效类型（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