From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/order/OrderTeamReward.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderTeamReward.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderTeamReward.java
index 64a4918..ec7bcf3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderTeamReward.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderTeamReward.java
@@ -13,6 +13,10 @@
*/
@Table("yeshi_ec_order_team_reward")
public class OrderTeamReward {
+
+ public static final int LEVEL_ONE = 1;// 鐩存帴濂栧姳
+ public static final int LEVEL_TWO = 2;// 闂存帴濂栧姳
+
// 鏈煡
public static final int STATE_UNKNOWN = 0;
// 鏈埌璐�
@@ -46,10 +50,27 @@
private BigDecimal money;
@Column(name = "otr_original_money")
private BigDecimal originalMoney;
+
+ @Column(name = "otr_pre_get_time")
+ private Date preGetTime;// 棰勪及鍒拌处鏃堕棿
+ @Column(name = "otr_get_time")
+ private Date getTime;// 瀹為檯鍒拌处鏃堕棿
+
@Column(name = "otr_create_time")
private Date createTime;
@Column(name = "otr_update_time")
private Date updateTime;
+
+ @Column(name = "otr_level")
+ private Integer level;// 鐩存帴/闂存帴琛ヨ创
+
+ public Integer getLevel() {
+ return level;
+ }
+
+ public void setLevel(Integer level) {
+ this.level = level;
+ }
public Long getId() {
return id;
@@ -131,4 +152,20 @@
this.updateTime = updateTime;
}
+ public Date getPreGetTime() {
+ return preGetTime;
+ }
+
+ public void setPreGetTime(Date preGetTime) {
+ this.preGetTime = preGetTime;
+ }
+
+ public Date getGetTime() {
+ return getTime;
+ }
+
+ public void setGetTime(Date getTime) {
+ this.getTime = getTime;
+ }
+
}
--
Gitblit v1.8.0