From 58ee87fd64efdb75d16e396c3d952d3522c3a747 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 17:54:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/vo/user/UserVipRateVO.java | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserVipRateVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserVipRateVO.java
index db3bf9a..c901be9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserVipRateVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserVipRateVO.java
@@ -3,6 +3,9 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+
public class UserVipRateVO implements Serializable {
/**
*
@@ -10,25 +13,61 @@
private static final long serialVersionUID = 1L;
// 鐢ㄦ埛淇℃伅
+ @Expose
private Long id;
+ @Expose
private String nickName;
+ @Expose
private String portrait;
-
- private boolean vip;
+ @Expose
private String successTime;
+ @Expose
private BigDecimal earnMoney;
+ @Expose
private BigDecimal conserveMoney;
+ @Expose
private String helpLink;
-
+ @Expose
+ private String csdLink;
+ @Expose
+ private String inviteCode;
+ @Expose
private long finishTeam;
+ @Expose
private long finishHongBao;
- private BigDecimal finishGoldCoin;
+ @Expose
+ private long finishGoldCoin;
+ @Expose
private BigDecimal finishMoney;
-
+ @Expose
private BigDecimal limitMoney;
- private BigDecimal limitgoldCoin;
+ @Expose
+ private long limitgoldCoin;
+ @Expose
private long limitTeam;
+ @Expose
private long limitHongBao;
+ @Expose
+ private UserVIPInfo vipInfo;//vip淇℃伅
+ @Expose
+ private String leftTime;//鍓╀綑瀹℃牳鏃堕棿
+
+
+ public String getLeftTime() {
+ return leftTime;
+ }
+
+ public void setLeftTime(String leftTime) {
+ this.leftTime = leftTime;
+ }
+
+ public UserVIPInfo getVipInfo() {
+ return vipInfo;
+ }
+
+ public void setVipInfo(UserVIPInfo vipInfo) {
+ this.vipInfo = vipInfo;
+ }
public Long getId() {
return id;
@@ -52,14 +91,6 @@
public void setPortrait(String portrait) {
this.portrait = portrait;
- }
-
- public boolean isVip() {
- return vip;
- }
-
- public void setVip(boolean vip) {
- this.vip = vip;
}
public String getSuccessTime() {
@@ -110,11 +141,11 @@
this.finishHongBao = finishHongBao;
}
- public BigDecimal getFinishGoldCoin() {
+ public long getFinishGoldCoin() {
return finishGoldCoin;
}
- public void setFinishGoldCoin(BigDecimal finishGoldCoin) {
+ public void setFinishGoldCoin(long finishGoldCoin) {
this.finishGoldCoin = finishGoldCoin;
}
@@ -134,11 +165,11 @@
this.limitMoney = limitMoney;
}
- public BigDecimal getLimitgoldCoin() {
+ public long getLimitgoldCoin() {
return limitgoldCoin;
}
- public void setLimitgoldCoin(BigDecimal limitgoldCoin) {
+ public void setLimitgoldCoin(long limitgoldCoin) {
this.limitgoldCoin = limitgoldCoin;
}
@@ -157,4 +188,20 @@
public void setLimitHongBao(long limitHongBao) {
this.limitHongBao = limitHongBao;
}
+
+ public String getCsdLink() {
+ return csdLink;
+ }
+
+ public void setCsdLink(String csdLink) {
+ this.csdLink = csdLink;
+ }
+
+ public String getInviteCode() {
+ return inviteCode;
+ }
+
+ public void setInviteCode(String inviteCode) {
+ this.inviteCode = inviteCode;
+ }
}
--
Gitblit v1.8.0