From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 31 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..0aa08bc 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
@@ -1,89 +1,154 @@
package com.yeshi.fanli.entity.bus.user;
-import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-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 STATE_SUCCESS = 1;// 鎴愬姛
+ public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
+
+ // 鑴辩鐘舵��
+ public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
+ public static int EXPIRE_BREAK = 1;// 閭�璇峰叧绯昏劚绂�
+ public static int EXPIRE_BREAK_VIP = 2; // vip鑴辩鍏崇郴
+ public static int EXPIRE_BREAK_VIP_DEL3 = 3; // 鐩存帴鑴辩鍏崇郴鍒犻櫎
+ public static int EXPIRE_BREAK_VIP_DEL4 = 4; // 闂存帴鑴辩鍏崇郴鍒犻櫎
+ public static int EXPIRE_BREAK_VIP_DEL34 = 34; // 鐩存帴銆侀棿鎺ヨ劚绂诲叧绯诲垹闄�
+
@Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
private Long id;
-
- @ManyToOne
- @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娣诲姞锛�
+
+ public ThreeSale(Long id) {
+ this.id = id;
+ }
+
+ public ThreeSale() {
+ }
+
+ @Column(name = "boss_id")
+ private UserInfo boss;// 閭�璇疯��
+
+ @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;
+
+ // 涓婁笂绾у叧绯荤姸鎬�
+ @Transient
+ private Boolean stateSuper;
+
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;
+ }
+
+ public Boolean getStateSuper() {
+ return stateSuper;
+ }
+
+ public void setStateSuper(Boolean stateSuper) {
+ this.stateSuper = stateSuper;
+ }
+
}
--
Gitblit v1.8.0