From 94e043b0d3fabe60dabce6df28b2ee6a1df7114e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 20 五月 2019 15:03:16 +0800
Subject: [PATCH] 首页限时秒杀接口更改

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java |  101 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
index 03663e2..6c63486 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -8,82 +8,137 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.yeshi.utils.mybatis.Column;
 
 /**
  * 鍒嗛攢鍏崇郴
+ * 
  * @author cxx
  *
  * @date 2018骞�1鏈�29鏃�
  */
 @Entity
-@Table(name="yeshi_ec_threeSale")
+@Table(name = "yeshi_ec_threeSale")
 @org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")
 public class ThreeSale {
-	
+
+	public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
+	public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
+
+
 	@Id
-	@GeneratedValue(strategy=GenerationType.AUTO)
-	@Column(name="id")
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id")
 	private Long id;
+
+	public ThreeSale(Long id) {
+		this.id = id;
+	}
 	
+	public ThreeSale() {
+	}
+
 	@ManyToOne
-	@JoinColumn(name="boss_id")
-	@Column(name="boss_id")
-	private UserInfo boss;//閭�璇疯��
-	
+	@JoinColumn(name = "boss_id")
+	@Column(name = "boss_id")
+	private UserInfo boss;// 閭�璇疯��
+
 	@OneToOne
-	@JoinColumn(name="worker_id")
-	@Column(name="worker_id")
-	private UserInfo worker; //琚個璇疯��
-	
-	@Column(name="state")
-	private Boolean state;//鐘舵�侊細鏄惁閭�璇锋垚鍔� 琚個璇疯�呯櫥闄嗗悗鎵嶇畻閭�璇锋垚鍔�   1宸叉垚鍔熴��0杩樻湭鎴愬姛
-	
-	
-	@Column(name="expire")  // 鏄惁杩囨湡锛� 鏄惁杩囨湡锛氬垵濮�0  宸茶繃鏈�1   锛�2018.10.22娣诲姞锛�
+	@JoinColumn(name = "worker_id")
+	@Column(name = "worker_id")
+	private UserInfo worker; // 琚個璇疯��
+
+	@Column(name = "state")
+	private Boolean state;// 鐘舵�侊細鏄惁閭�璇锋垚鍔� 琚個璇疯�呯櫥闄嗗悗鎵嶇畻閭�璇锋垚鍔� 1宸叉垚鍔熴��0杩樻湭鎴愬姛
+
+	@Column(name = "expire")
+	// 鏄惁杩囨湡锛� 鏄惁杩囨湡锛氬垵濮�0 宸茶繃鏈�1 锛�2018.10.22娣诲姞锛�
 	private Integer expire;
-	
-	@Column(name="createTime")
+
+	@Column(name = "createTime")
 	private Long createTime;
-	
+
+	@Column(name = "succeedTime")
+	private Long succeedTime;
+
+	@Column(name = "updateTime")
+	private Long updateTime;
+
+	@Transient
+	private ThreeSaleExtraInfo threeSaleExtraInfo;
+
 	public Long getId() {
 		return id;
 	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}
+
 	public UserInfo getBoss() {
 		return boss;
 	}
+
 	public void setBoss(UserInfo boss) {
 		this.boss = boss;
 	}
+
 	public UserInfo getWorker() {
 		return worker;
 	}
+
 	public void setWorker(UserInfo worker) {
 		this.worker = worker;
 	}
+
 	public Long getCreateTime() {
 		return createTime;
 	}
+
 	public void setCreateTime(Long createTime) {
 		this.createTime = createTime;
 	}
+
 	public Boolean getState() {
 		return state;
 	}
+
 	public void setState(Boolean state) {
 		this.state = state;
 	}
+
 	public Integer getExpire() {
 		return expire;
 	}
+
 	public void setExpire(Integer expire) {
 		this.expire = expire;
 	}
-	
-	
-	
+
+	public Long getSucceedTime() {
+		return succeedTime;
+	}
+
+	public void setSucceedTime(Long succeedTime) {
+		this.succeedTime = succeedTime;
+	}
+
+	public Long getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Long updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public ThreeSaleExtraInfo getThreeSaleExtraInfo() {
+		return threeSaleExtraInfo;
+	}
+
+	public void setThreeSaleExtraInfo(ThreeSaleExtraInfo threeSaleExtraInfo) {
+		this.threeSaleExtraInfo = threeSaleExtraInfo;
+	}
+
 }

--
Gitblit v1.8.0