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/order/InviteOrderSubsidy.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
index 5b1ca7e..3a0e423 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
@@ -14,6 +14,10 @@
*/
@Table("yeshi_ec_invite_order_subsidy")
public class InviteOrderSubsidy {
+
+ public static final int LEVEL_ONE = 1;// 鐩存帴琛ヨ创
+ public static final int LEVEL_TWO = 2;// 闂存帴琛ヨ创
+
// 鏈煡
public static final int STATE_UNKNOWN = 0;
// 鍙ˉ璐�
@@ -37,6 +41,8 @@
private Long uid;
@Column(name = "os_money")
private BigDecimal money;
+ @Column(name = "os_original_money")
+ private BigDecimal originalMoney;// 鍘熻繑鍒�
@Column(name = "os_order_no")
private String orderNo;
@Column(name = "os_source_type")
@@ -47,6 +53,56 @@
private Date createTime;
@Column(name = "os_update_time")
private Date updateTime;
+ @Column(name = "os_pre_get_time")
+ private Date preGetTime;
+ @Column(name = "os_get_time")
+ private Date getTime;
+ @Column(name = "os_level")
+ private Integer level;// 鐩存帴/闂存帴
+ @Column(name = "os_valid_time")
+ private Date validTime;
+ @Column(name = "os_invalid_time")
+ private Date inValidTime;
+
+ public Date getInValidTime() {
+ return inValidTime;
+ }
+
+ public void setInValidTime(Date inValidTime) {
+ this.inValidTime = inValidTime;
+ }
+
+ public Date getValidTime() {
+ return validTime;
+ }
+
+ public void setValidTime(Date validTime) {
+ this.validTime = validTime;
+ }
+
+ public Integer getLevel() {
+ return level;
+ }
+
+ public void setLevel(Integer level) {
+ this.level = level;
+ }
+
+ 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;
+ }
public Long getId() {
return id;
@@ -112,4 +168,12 @@
this.updateTime = updateTime;
}
+ public BigDecimal getOriginalMoney() {
+ return originalMoney;
+ }
+
+ public void setOriginalMoney(BigDecimal originalMoney) {
+ this.originalMoney = originalMoney;
+ }
+
}
--
Gitblit v1.8.0