From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
index 64ac795..0628825 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -93,7 +94,6 @@
* 限购数量 为空表示不限
*/
@ApiModelProperty(value = "限购数量 为空表示不限")
-
@TableField("limitCount")
private Integer limitCount;
/**
@@ -102,13 +102,23 @@
@ApiModelProperty(value = "轮播图 逗号分隔")
@TableField("banner")
private String banner;
+
+
+ /**
+ *有效期结束时间 不填表示永久
+ */
+ @TableField("endTime")
+ @ApiModelProperty(value = "有效期结束时间 不填表示永久")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
/**
*有效期开始时间 不填表示永久
*/
- @TableField("endTime")
+ @TableField("startTime")
@ApiModelProperty(value = "有效期开始时间 不填表示永久")
- private Date endTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -132,7 +142,6 @@
*/
@TableField("useScope")
@ApiModelProperty(value = "使用范围1门店2场地")
-
private Integer useScope;
/**
*根据适用范围，存储门店id或场地id，多个逗号分隔
@@ -151,8 +160,13 @@
*/
@ApiModelProperty(value = "排序")
@TableField("sort")
- private String sort;
+ private Integer sort;
+ /**
+ *门店id 当使用范围为场地的时候存储门店id
+ */
+ @TableField("storeIds")
+ private String storeIds;
/**
*运营商id
*/
@@ -165,12 +179,6 @@
@ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")
@TableField("status")
private Integer status;
- /**
- *门店ids
- */
- @ApiModelProperty(value = "门店ids")
- @TableField("storeIds")
- private String storeIds;
@ApiModelProperty("是否购买 0否1是")
@TableField(exist = false)
@@ -178,6 +186,37 @@
@ApiModelProperty("立即购买页面的协议列表")
@TableField(exist = false)
private List<THuiminAgreementSetting> agreementSettings;
+ /**
+ * 状态: 1-未开始 2-已开始 3-已结束
+ */
+ @TableField(exist = false)
+ private Integer flag;
+
+ /**
+ * 已购数量
+ */
+ @TableField(exist = false)
+ private Integer buyCount;
+ @TableField(exist = false)
+ private Long current;
+ @TableField(exist = false)
+ private Long size;
+ /**
+ * 惠民卡状态：1未开始 2已开始 3已结束
+ */
+ @TableField(exist = false)
+ private Integer huiMinStatus;
+
+ /**
+ * 1=平台，2=城市管理员，3=门店
+ */
+ @TableField(exist = false)
+ private Integer objectType;
+
+ @TableField(exist = false)
+ private Integer objectId;
+
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1