From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
index 04709b0..d9cff53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
@@ -16,16 +16,35 @@
@Table("yeshi_ec_user_system_coupon")
public class UserSystemCoupon {
- // 鐘舵��:鏈娇鐢�1銆佷娇鐢ㄤ腑2銆佸凡浣跨敤3銆佸凡杩囨湡4
+ // 鏈娇鐢�1
public final static int STATE_CAN_USE = 1;
+ // 浣跨敤涓�2
public final static int STATE_IN_USE = 2;
+ // 宸蹭娇鐢�3
public final static int STATE_END_USE = 3;
+ // 宸茶繃鏈�4
public final static int STATE_OVERDUE = 4;
+ // 浣跨敤閫�鍥� -涓嶅叆搴�
+ public final static int STATE_BACK = 5;
+
+
+ // 鍙娇鐢ㄣ�佸彲璧犻�侊紙杩斿洖鍓嶇瀛楁锛�
+ public final static int STATE_USE_GIVE = 10;
+ // 鍙彲璧犻�侊紙杩斿洖鍓嶇瀛楁锛�
+ public final static int STATE_GIVE_ONLY = 11;
+ // 璧犻�佷腑锛堣繑鍥炲墠绔瓧娈碉級
+ public final static int STATE_GIVE_IN = 12;
+ // 璧犻�佹垚鍔燂紙杩斿洖鍓嶇瀛楁锛�
+ public final static int STATE_GIVE_END = 13;
// 鏉ユ簮: 鏂颁汉鎶藉銆侀個璇峰鍔�
- public final static String SOURCE_CHOUJIANG = "鏂颁汉鎶藉";
+ public final static String SOURCE_NEWBIES = "鏂颁汉鎶藉";
public final static String SOURCE_YAOQING = "閭�璇峰鍔�";
+ public final static String SOURCE_SYSTEM_PUSH = "绯荤粺璧犻��";
+ public final static String SOURCE_DAILY_REBATE = "澶╁ぉ鎶�";
+ public final static String SOURCE_EXCHANGE = "閲戝竵鍏戞崲";
+ public final static String SOURCE_GIVE = "濂藉弸璧犻��";
@Expose
@Column(name = "usc_id")
@@ -53,7 +72,11 @@
@Expose
@Column(name = "usc_state_activate")
private Integer stateActivated;
-
+
+ // 鏄惁宸茶禒閫�
+ @Column(name = "usc_give")
+ private Boolean give;
+
// 璧峰鏃堕棿
@Column(name = "usc_start_time")
private Date startTime;
@@ -161,4 +184,12 @@
public void setStateActivated(Integer stateActivated) {
this.stateActivated = stateActivated;
}
+
+ public Boolean getGive() {
+ return give;
+ }
+
+ public void setGive(Boolean give) {
+ this.give = give;
+ }
}
--
Gitblit v1.8.0