From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
index 0ad8a8f..6ccc5eb 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
@@ -5,9 +5,12 @@
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;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,7 +18,7 @@
/**
* <p>
- * 惠民卡
+ * 玩湃惠民卡
* </p>
*
* @author jqs
@@ -35,12 +38,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 惠民卡名称
+ * 玩湃惠民卡名称
*/
@TableField("huiMinName")
private String huiMinName;
/**
- *惠民卡类型1年度2年内
+ *玩湃惠民卡类型1年度2年内
*/
@TableField("huiMinType")
private String huiMinType;
@@ -88,7 +91,20 @@
*有效期 不填表示永久
*/
@TableField("endTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
+
+ /**
+ *有效期开始时间
+ */
+ @TableField("startTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+
+
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -99,23 +115,25 @@
*/
@TableField("useTimes")
private String useTimes;
- /**
- *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
- */
+// /**
+// *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
+// */
@TableField("unUseTimes")
private String unUseTimes;
+
+
/**
*使用范围1门店2场地
*/
@TableField("useScope")
- private String useScope;
+ private Integer useScope;
/**
*根据适用范围，存储门店id或场地id，多个逗号分隔
*/
@TableField("useIds")
private String useIds;
/**
- *惠民卡介绍
+ *玩湃惠民卡介绍
*/
@TableField("introduce")
private String introduce;
@@ -127,10 +145,53 @@
/**
*门店id
*/
- @TableField("storeId")
- private Integer storeId;
+ @TableField("storeIds")
+ private String storeIds;
+ /**
+ *运营商id
+ */
+ @TableField("operatorId")
+ private Integer operatorId;
+ /**
+ *状态 1已上架 2已下架 3已删除
+ */
+ @ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")
+ @TableField("status")
+ private Integer status;
+
+
+
+ @TableField(exist = false)
+ private String startTimeStr;
+ @TableField(exist = false)
+ private String endTimeStr;
+ @TableField(exist = false)
+ private Long current;
+ @TableField(exist = false)
+ private Long size;
+
+ /**
+ * 已购数量
+ */
+ @TableField(exist = false)
+ private Integer buyCount;
+ /**
+ * 玩湃惠民卡状态：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