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/HongBaoV2.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
index 8378bd8..40a7424 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
@@ -25,27 +25,26 @@
public final static int STATE_KELINGQU = 2;
public final static int STATE_YILINGQU = 3;
public final static int STATE_SHIXIAO = 4;
-
+
// 5-閮ㄥ垎澶辨晥(杩斿洖瀹㈡埛绔樉绀虹敤锛屼笉鐢ㄤ綔閫昏緫澶勭悊)
public final static int STATE_BUFENSHIXIAO = 5;
- // 鑷喘绾㈠寘 鑰佺増 2灞炰簬鑷喘
+ // 鑷喘绾㈠寘 鑰佺増 2灞炰簬鑷喘
public final static int TYPE_ZIGOU = 1;
// 娲诲姩绾㈠寘
public final static int TYPE_HUODONG = 3;
// 鏂颁汉绾㈠寘
public final static int TYPE_XINREN = 4;
-
+
// 浣跨敤鍒哥孩鍖�
public final static int TYPE_COUPON = 10;
-
public final static int TYPE_YAOQING = 5;
// 涓�绾у垎閿�绾㈠寘
public final static int TYPE_YIJI = 6;
// 浜岀骇鍒嗛攢绾㈠寘
public final static int TYPE_ERJI = 7;
-
+
// 鍒嗕韩鍟嗗搧寰楁潵鐨勭孩鍖�
public final static int TYPE_SHARE_GOODS = 20;
// 涓�绾у垎浜禋鍒嗛攢绾㈠寘
@@ -53,6 +52,16 @@
// 浜岀骇鍒嗕韩璧氬垎閿�绾㈠寘
public final static int TYPE_SHARE_ERJI = 22;
+ // 閲戝竵鍏戞崲绾㈠寘
+ public final static int TYPE_EXCHANGE = 30;
+
+ // 楗夸簡涔堢孩鍖�
+ public final static int TYPE_ELME = 25;
+
+ // 瓒呯骇浼氬憳
+ public final static int RANK_VIP = 100;
+ public final static int RANK_VIP_PRE_3 = 30;// 瓒呯骇浼氬憳绗竴闃舵
+ public final static int RANK_VIP_PRE_7 = 70;// 瓒呯骇浼氬憳绗簩闃舵
@Column(name = "hb_id")
private Long id;
@@ -104,6 +113,10 @@
// 鏇存柊鏃堕棿
@Column(name = "cog_update_time")
private Date updateTime;
+
+ // 璁㈠崟绫诲瀷
+ @Column(name = "cog_order_type")
+ private Integer orderType;
public HongBaoV2() {
@@ -216,4 +229,12 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
}
--
Gitblit v1.8.0