From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:32 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 c4b5485..3c49174 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,21 @@
@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("startTime")
+ @ApiModelProperty(value = "有效期结束时间 不填表示永久")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -118,14 +126,14 @@
/**
*可使用时间段，时分秒，多个逗号分隔
*/
- @ApiModelProperty(value = "可使用时间段，时分秒，多个逗号分隔")
+ @ApiModelProperty(value = "可使用时间段，时分秒，多个逗号分隔,跨周分号分隔")
@TableField("useTimes")
private String useTimes;
/**
*不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
*/
@TableField("unUseTimes")
- @ApiModelProperty(value = "可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔")
+ @ApiModelProperty(value = "不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔")
private String unUseTimes;
/**
*使用范围1门店2场地
@@ -151,8 +159,13 @@
*/
@ApiModelProperty(value = "排序")
@TableField("sort")
- private String sort;
+ private Integer sort;
+ /**
+ *门店id 当使用范围为场地的时候存储门店id
+ */
+ @TableField("storeIds")
+ private String storeIds;
/**
*运营商id
*/
@@ -165,12 +178,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 +185,19 @@
@ApiModelProperty("立即购买页面的协议列表")
@TableField(exist = false)
private List<THuiminAgreementSetting> agreementSettings;
+ /**
+ * 状态: 1-未开始 2-已开始 3-已结束
+ */
+ @TableField(exist = false)
+ private Integer flag;
+
+ /**
+ * 已购数量
+ */
+ @TableField(exist = false)
+ private Integer buyCount;
+
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1