From 8ac93bd9b45e3d25783798e1fe8cfc26bedd57d2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 十二月 2020 17:17:48 +0800
Subject: [PATCH] 完善天天抽奖
---
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
index c5a196c..3af8eaa 100644
--- a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
+++ b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
@@ -1,6 +1,8 @@
package com.ks.lucky.pojo.DO;
import org.springframework.data.annotation.Transient;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
@@ -9,8 +11,9 @@
import java.util.Date;
import java.util.List;
+@Table("lucky_activity")
@Valid
-public class LuckyActivity implements Serializable {
+public class LuckyActivity implements Serializable {
//鏈彁浜ゅ鏍�
@@ -32,7 +35,7 @@
public final static int STATE_NOT_STARTED = 10;
//宸茬粡寮�濮�
- public final static int STATE_STARTED = 10;
+ public final static int STATE_STARTED = 20;
//宸茬粡缁撴潫锛岀瓑寰呴寮�濂�
public final static int STATE_FINISH = 30;
@@ -44,48 +47,74 @@
public final static int STATE_OPENED = 41;
+ @Column(name="id")
private Long id;
+
+ @Column(name="app_id")
@NotNull(message = "搴旂敤ID涓嶈兘涓虹┖")
private Long appId;
+ @Column(name="sponsor_id")
@NotNull(message = "璧炲姪鍟嗕笉鑳戒负绌�")
private Long sponsorId;
+ @Column(name="`name`")
@NotEmpty(message = "娲诲姩鍚嶇О涓嶈兘涓虹┖")
private String name;
+
+ @Column(name="material_poster")
@NotEmpty(message = "娲诲姩娴锋姤涓嶈兘涓虹┖")
private String materialPoster;
+ @Column(name="material_tag_image")
private String materialTagImage;
+ @Column(name="material_")
private String material;
+ @Column(name="`desc`")
private String desc;
/**
* 鏈�澶т汉鏁�
*/
+ @Column(name="max_person_count")
private Integer maxPersonCount;
/**
* 鐜版湁浜烘暟
*/
+ @Column(name="current_person_count")
private Integer currentPersonCount;
+ @Column(name="`state`")
private Integer state;
+ @Column(name="state_remarks")
private String stateRemarks;
+ @Column(name="pre_start_time")
@NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
- private Date startTime;
- @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
- private Date finishTime;
+ private Date preStartTime;
+ @Column(name="actual_start_time")
+ private Date actualStartTime;
+
+ @Column(name="pre_finish_time")
+ private Date preFinishTime;
+
+ @Column(name="actual_finish_time")
+ private Date actualFinishTime;
+
+ @Column(name="pre_open_time")
private Date preOpenTime;
+ @Column(name="actual_open_time")
private Date actualOpenTime;
+ @Column(name="create_time")
private Date createTime;
+ @Column(name="update_time")
private Date updateTime;
@Transient
@@ -229,22 +258,6 @@
this.stateRemarks = stateRemarks == null ? null : stateRemarks.trim();
}
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getFinishTime() {
- return finishTime;
- }
-
- public void setFinishTime(Date finishTime) {
- this.finishTime = finishTime;
- }
-
public Date getPreOpenTime() {
return preOpenTime;
}
@@ -268,4 +281,36 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public Date getPreFinishTime() {
+ return preFinishTime;
+ }
+
+ public void setPreFinishTime(Date preFinishTime) {
+ this.preFinishTime = preFinishTime;
+ }
+
+ public Date getActualFinishTime() {
+ return actualFinishTime;
+ }
+
+ public void setActualFinishTime(Date actualFinishTime) {
+ this.actualFinishTime = actualFinishTime;
+ }
+
+ public Date getPreStartTime() {
+ return preStartTime;
+ }
+
+ public void setPreStartTime(Date preStartTime) {
+ this.preStartTime = preStartTime;
+ }
+
+ public Date getActualStartTime() {
+ return actualStartTime;
+ }
+
+ public void setActualStartTime(Date actualStartTime) {
+ this.actualStartTime = actualStartTime;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0