From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 310c633..b993330 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
@@ -91,17 +91,20 @@
*有效期 不填表示永久
*/
@TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @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")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
+
+
+
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -112,16 +115,18 @@
*/
@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，多个逗号分隔
*/
@@ -162,6 +167,30 @@
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() {
--
Gitblit v1.7.1