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 | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 6d8518c..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,12 +1,8 @@
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;
@@ -22,12 +18,17 @@
@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;// 杩囨湡鐘舵��
-
+ // 閭�璇风姸鎬�
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)
@@ -65,6 +66,10 @@
@Transient
private ThreeSaleExtraInfo threeSaleExtraInfo;
+
+ // 涓婁笂绾у叧绯荤姸鎬�
+ @Transient
+ private Boolean stateSuper;
public Long getId() {
return id;
@@ -138,4 +143,12 @@
this.threeSaleExtraInfo = threeSaleExtraInfo;
}
+ public Boolean getStateSuper() {
+ return stateSuper;
+ }
+
+ public void setStateSuper(Boolean stateSuper) {
+ this.stateSuper = stateSuper;
+ }
+
}
--
Gitblit v1.8.0