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/redpack/RedPackWinInvite.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
index 6848540..838075d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
@@ -6,6 +6,8 @@
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+
/**
* 绾㈠寘鑾峰緱璁板綍-閭�璇风浉鍏�
*
@@ -16,9 +18,10 @@
public class RedPackWinInvite {
public enum RedPackWinInviteTypeEnum {
newUserReward("棣栨浣跨敤鏉挎牀蹇渷鏂颁汉濂栧姳"),
- inviteSucceed("鎴愬姛閭�璇峰ソ鍙嬬珛寰楃幇閲�"),
- firstSharedOrder("瀹屾垚鍒嗕韩璁㈠崟閫掑濂栧姳"),
- monthSharedOrder("瀹屾垚鍒嗕韩璁㈠崟杩炵画濂栧姳");
+ zeroStageReward("閭�璇峰叧绯荤‘瀹�"),
+ oneStageReward("鎴愬姛閭�璇峰ソ鍙嬬珛寰楃幇閲�"),
+ twoStageReward("瀹屾垚鍒嗕韩璁㈠崟閫掑濂栧姳"),
+ threeStageReward("瀹屾垚鍒嗕韩璁㈠崟杩炵画濂栧姳");
private final String desc;
@@ -30,38 +33,47 @@
return desc;
}
}
-
+
@Column(name = "rwr_id")
private Long id;
// 鐢ㄦ埛id
@Column(name = "rwr_uid")
private Long uid;
-
+
// 闃熷憳id
@Column(name = "rwr_team_uid")
private Long teamUid;
-
+
// 浣欓
@Column(name = "rwr_money")
private BigDecimal money;
-
+
// 绫诲瀷
@Column(name = "rwr_type")
private RedPackWinInviteTypeEnum type;
-
+
// 璁㈠崟鏉ユ簮
@Column(name = "rwr_source")
private Integer source;
-
+
+ // 鍞竴鏍囪瘑
+ @Column(name = "rwr_identify_code")
+ private String identifyCode;
+
// 璁㈠崟鍙�
@Column(name = "rwr_order_no")
private String orderNo;
-
+
@Column(name = "rwr_create_time")
private Date createTime;
-
+
@Column(name = "rwr_update_time")
private Date updateTime;
+
+ // 閭�璇蜂汉
+ private UserInfo inviter;
+ // 鍙楅個浜�
+ private UserInfo invitee;
public Long getId() {
return id;
@@ -134,4 +146,29 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public String getIdentifyCode() {
+ return identifyCode;
+ }
+
+ public void setIdentifyCode(String identifyCode) {
+ this.identifyCode = identifyCode;
+ }
+
+ public UserInfo getInviter() {
+ return inviter;
+ }
+
+ public void setInviter(UserInfo inviter) {
+ this.inviter = inviter;
+ }
+
+ public UserInfo getInvitee() {
+ return invitee;
+ }
+
+ public void setInvitee(UserInfo invitee) {
+ this.invitee = invitee;
+ }
+
}
--
Gitblit v1.8.0