From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复

---
 fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java |  177 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 140 insertions(+), 37 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
index e7ee9c7..1cf54d7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
@@ -30,7 +30,7 @@
 	// 绱璁㈠崟
 	private long totalOrder;
 	// 鏈�杩戜笅鍗曟椂闂�
-	private long lastOrderTime;
+	private Long lastOrderTime;
 
 	// 涓�绾ч槦鍛�
 	private long countLevelOne;
@@ -59,9 +59,8 @@
 	private String accountNameWX;
 	// 绱杞处-寰俊
 	private double totalMoneyWX;
-	
-	
 
+	
 	private int wxUnionIdState; // 寰俊unionId鐘舵��
 
 	private int taobaoUidState; // 娣樺疂ID鐘舵��
@@ -72,16 +71,64 @@
 
 	
 	/* 灏佺璐﹀彿  */
-	private String f_wxUnionId; // 寰俊unionId
+	private String wxUnionIdInvalid; // 寰俊unionId
 
-	private String f_taobaoUid; // 娣樺疂ID
+	private String taobaoUidInvalid; // 娣樺疂ID
 
-	private String f_phone; // 鎵嬫満鍙�
+	private String phoneInvalid; // 鎵嬫満鍙�
 
-	private String f_alipayAccount; // 鏀粯瀹濊处鍙�
+	private String alipayAccountInvalid; // 鏀粯瀹濊处鍙�
 	
 	
+	private String tbSpecialId;
+	private String tbRelationId;
 	
+	// 鍓╀綑閲戝竵鏁伴噺
+	private int goldCoin;
+	// 鐢ㄦ埛鏍囪瘑
+	private String mark;
+	
+	// 鐢ㄦ埛VIP绛夌骇
+	private String userLevel;
+	
+	// 閭�璇蜂汉
+	private String bossName;
+	// 閭�璇风爜
+	private String inviteCode;
+	// 閭�璇风爜
+	private String inviteCodeVip;
+	// 寰俊鍙�
+	private String wxId;
+	
+	// 鎬绘秷鑰楅噾甯�
+	private long totalGoldCoinUsed;
+
+
+	
+
+	public String getRankId() {
+		return rankId;
+	}
+
+	public void setRankId(String rankId) {
+		this.rankId = rankId;
+	}
+
+	public String getRankName() {
+		return rankName;
+	}
+
+	public void setRankName(String rankName) {
+		this.rankName = rankName;
+	}
+
+	public String getRankPicture() {
+		return rankPicture;
+	}
+
+	public void setRankPicture(String rankPicture) {
+		this.rankPicture = rankPicture;
+	}
 
 	public String getUnaccountedMoney() {
 		return unaccountedMoney;
@@ -131,11 +178,11 @@
 		this.totalOrder = totalOrder;
 	}
 
-	public long getLastOrderTime() {
+	public Long getLastOrderTime() {
 		return lastOrderTime;
 	}
 
-	public void setLastOrderTime(long lastOrderTime) {
+	public void setLastOrderTime(Long lastOrderTime) {
 		this.lastOrderTime = lastOrderTime;
 	}
 
@@ -267,60 +314,116 @@
 		this.alipayAccountState = alipayAccountState;
 	}
 
-	public String getF_wxUnionId() {
-		return f_wxUnionId;
+	public String getWxUnionIdInvalid() {
+		return wxUnionIdInvalid;
 	}
 
-	public void setF_wxUnionId(String f_wxUnionId) {
-		this.f_wxUnionId = f_wxUnionId;
+	public void setWxUnionIdInvalid(String wxUnionIdInvalid) {
+		this.wxUnionIdInvalid = wxUnionIdInvalid;
 	}
 
-	public String getF_taobaoUid() {
-		return f_taobaoUid;
+	public String getTaobaoUidInvalid() {
+		return taobaoUidInvalid;
 	}
 
-	public void setF_taobaoUid(String f_taobaoUid) {
-		this.f_taobaoUid = f_taobaoUid;
+	public void setTaobaoUidInvalid(String taobaoUidInvalid) {
+		this.taobaoUidInvalid = taobaoUidInvalid;
 	}
 
-	public String getF_phone() {
-		return f_phone;
+	public String getPhoneInvalid() {
+		return phoneInvalid;
 	}
 
-	public void setF_phone(String f_phone) {
-		this.f_phone = f_phone;
+	public void setPhoneInvalid(String phoneInvalid) {
+		this.phoneInvalid = phoneInvalid;
 	}
 
-	public String getF_alipayAccount() {
-		return f_alipayAccount;
+	public String getAlipayAccountInvalid() {
+		return alipayAccountInvalid;
 	}
 
-	public void setF_alipayAccount(String f_alipayAccount) {
-		this.f_alipayAccount = f_alipayAccount;
+	public void setAlipayAccountInvalid(String alipayAccountInvalid) {
+		this.alipayAccountInvalid = alipayAccountInvalid;
 	}
 
-	public String getRankId() {
-		return rankId;
+	public String getTbSpecialId() {
+		return tbSpecialId;
 	}
 
-	public void setRankId(String rankId) {
-		this.rankId = rankId;
+	public void setTbSpecialId(String tbSpecialId) {
+		this.tbSpecialId = tbSpecialId;
 	}
 
-	public String getRankName() {
-		return rankName;
+	public String getTbRelationId() {
+		return tbRelationId;
 	}
 
-	public void setRankName(String rankName) {
-		this.rankName = rankName;
+	public void setTbRelationId(String tbRelationId) {
+		this.tbRelationId = tbRelationId;
 	}
 
-	public String getRankPicture() {
-		return rankPicture;
+	public int getGoldCoin() {
+		return goldCoin;
 	}
 
-	public void setRankPicture(String rankPicture) {
-		this.rankPicture = rankPicture;
+	public void setGoldCoin(int goldCoin) {
+		this.goldCoin = goldCoin;
+	}
+
+	public String getMark() {
+		return mark;
+	}
+
+	public void setMark(String mark) {
+		this.mark = mark;
+	}
+
+	public String getUserLevel() {
+		return userLevel;
+	}
+
+	public void setUserLevel(String userLevel) {
+		this.userLevel = userLevel;
+	}
+
+	public String getInviteCode() {
+		return inviteCode;
+	}
+
+	public void setInviteCode(String inviteCode) {
+		this.inviteCode = inviteCode;
+	}
+
+	public String getInviteCodeVip() {
+		return inviteCodeVip;
+	}
+
+	public void setInviteCodeVip(String inviteCodeVip) {
+		this.inviteCodeVip = inviteCodeVip;
+	}
+
+	public long getTotalGoldCoinUsed() {
+		return totalGoldCoinUsed;
+	}
+
+	public void setTotalGoldCoinUsed(long totalGoldCoinUsed) {
+		this.totalGoldCoinUsed = totalGoldCoinUsed;
+	}
+
+	public String getBossName() {
+		return bossName;
+	}
+
+	public void setBossName(String bossName) {
+		this.bossName = bossName;
+	}
+
+	public String getWxId() {
+		return wxId;
+	}
+
+	public void setWxId(String wxId) {
+		this.wxId = wxId;
 	}
 	
 }

--
Gitblit v1.8.0