From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
index f70b550..b7a04cb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
@@ -12,6 +12,13 @@
@Table("yeshi_ec_user_system_coupon_give_record")
public class UserSystemCouponGiveRecord {
+ // 鏈鍙�
+ public final static int STATE_INIT = 0;
+ // 宸查鍙�
+ public final static int STATE_RECEIVE =1;
+ // 宸茶繃鏈� 閫�鍥�
+ public final static int STATE_OVERDUE = 2;
+
@Column(name = "cgr_id")
private Long id;
// 鍒竔d
@@ -20,16 +27,21 @@
// 璧犻�乽id
@Column(name = "cgr_give_uid")
private Long giveUid;
- // 棰嗗彇uid
- @Column(name = "cgr_receive_uid")
- private Long receiveUid;
// 璧犻�佹椂闂�
@Column(name = "cgr_give_time")
private Date giveTime;
+ // 璧犻�佺粨鏉熸椂闂�
+ @Column(name = "cgr_end_time")
+ private Date endTime;
+ // 棰嗗彇uid
+ @Column(name = "cgr_receive_uid")
+ private Long receiveUid;
// 棰嗗彇鏃堕棿
@Column(name = "cgr_receive_time")
private Date receiveTime;
-
+ // 鐘舵��
+ @Column(name = "cgr_state")
+ private Integer state;
public Long getId() {
@@ -79,5 +91,20 @@
public void setReceiveTime(Date receiveTime) {
this.receiveTime = receiveTime;
}
-
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
}
--
Gitblit v1.8.0