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/admin/UserInfoAdmin.java | 250 ++++++++++++++++++++++----------------------------
1 files changed, 110 insertions(+), 140 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/UserInfoAdmin.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/UserInfoAdmin.java
index 1fe23ef..5cc8cb7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/UserInfoAdmin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/UserInfoAdmin.java
@@ -1,54 +1,46 @@
package com.yeshi.fanli.entity.admin;
+import java.io.Serializable;
+
import com.yeshi.fanli.entity.bus.user.UserInfo;
-public class UserInfoAdmin {
+public class UserInfoAdmin implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ // 鐢ㄦ埛鍩烘湰淇℃伅
private UserInfo userInfo;
-
- private int tbNameState; // 娣樺疂鏄电О 1鏈綍鍏� 2宸插瓨鍦� 3瑙ｇ粦
- private int wxNameState;// 寰俊鏄电О 1鏈綍鍏� 2宸插瓨鍦� 3瑙ｇ粦
- private int phoneState; // 鐢佃瘽鍙风爜 1鏈綍鍏� 2宸插瓨鍦� 3瑙ｇ粦
-
- // 鏈�杩戜笅鍗曟椂闂�
- private long lastOrderTime;
- // 寰俊鏄电О -鍘嗗彶
- private String wxNameHistory;
- // 娣樺疂鏄电О-鍘嗗彶
- private String tbNameHistory;
- // 鐢佃瘽-鍘嗗彶
- private String phoneHistory;
- // 淇敼鍐呭
- private String contentChange;
-
- // 鏈叆璐�
- private double unaccountedMoney;
+
+ // 鏈埌璐︽敹鐩�
+ private String unaccountedMoney;
// 鍘嗗彶鎬绘敹鐩�
- private double totalMoneyHistory;
- // 绱鎻愮幇
+ private String totalMoneyHistory;
+ // 绱鎻愮幇閲戦
private double totalExtract;
-
+
// 浠婃棩璁㈠崟
private long todayOrder;
// 鏈湀璁㈠崟
private long monthOrder;
// 绱璁㈠崟
private long totalOrder;
-
- // 涓�搴﹂槦鍛�
+ // 鏈�杩戜笅鍗曟椂闂�
+ private long lastOrderTime;
+
+ // 涓�绾ч槦鍛�
private long countLevelOne;
- // 浜屽害闃熷憳
+ // 浜岀骇闃熷憳
private long countLevelTwo;
-
+
// 娴忚瓒宠抗
private long countScanHistory;
- // 鍒嗕韩鍟嗗搧
+ // 鍒嗕韩鍟嗗搧
private long countUserShares;
-
- // // 鍘嗗彶鎼滅储
- // private String contentChange;
-
- // 鏀粯鍖呯粦瀹歩d
+
+ // 缁戝畾鏀粯鍖卛d
private long accountBindId;
// 鏀粯瀹�
private String accountAlipay;
@@ -56,7 +48,7 @@
private String accountName;
// 绱杞处-鏀粯瀹�
private double totalMoney;
-
+
// 寰俊缁戝畾id
private long accountBindIdWX;
/// 寰俊璐﹀彿
@@ -65,9 +57,14 @@
private String accountNameWX;
// 绱杞处-寰俊
private double totalMoneyWX;
-
-
-
+
+ private int wxUnionIdState; // 寰俊unionId鐘舵��
+
+ private int taobaoUidState; // 娣樺疂ID鐘舵��
+
+ private int phoneState; // 鎵嬫満鍙风姸鎬�
+
+ private int alipayAccountState; // 鏀粯瀹濊处鍙风姸鎬�
public UserInfo getUserInfo() {
return userInfo;
@@ -77,45 +74,20 @@
this.userInfo = userInfo;
}
-
- public String getWxNameHistory() {
- return wxNameHistory;
- }
-
- public void setWxNameHistory(String wxNameHistory) {
- this.wxNameHistory = wxNameHistory;
- }
-
- public String getTbNameHistory() {
- return tbNameHistory;
- }
-
- public void setTbNameHistory(String tbNameHistory) {
- this.tbNameHistory = tbNameHistory;
- }
-
- public String getPhoneHistory() {
- return phoneHistory;
- }
-
- public void setPhoneHistory(String phoneHistory) {
- this.phoneHistory = phoneHistory;
- }
-
- public String getContentChange() {
- return contentChange;
- }
-
- public void setContentChange(String contentChange) {
- this.contentChange = contentChange;
- }
-
- public double getUnaccountedMoney() {
+ public String getUnaccountedMoney() {
return unaccountedMoney;
}
- public void setUnaccountedMoney(double unaccountedMoney) {
+ public void setUnaccountedMoney(String unaccountedMoney) {
this.unaccountedMoney = unaccountedMoney;
+ }
+
+ public String getTotalMoneyHistory() {
+ return totalMoneyHistory;
+ }
+
+ public void setTotalMoneyHistory(String totalMoneyHistory) {
+ this.totalMoneyHistory = totalMoneyHistory;
}
public double getTotalExtract() {
@@ -150,7 +122,53 @@
this.totalOrder = totalOrder;
}
-
+ public long getLastOrderTime() {
+ return lastOrderTime;
+ }
+
+ public void setLastOrderTime(long lastOrderTime) {
+ this.lastOrderTime = lastOrderTime;
+ }
+
+ public long getCountLevelOne() {
+ return countLevelOne;
+ }
+
+ public void setCountLevelOne(long countLevelOne) {
+ this.countLevelOne = countLevelOne;
+ }
+
+ public long getCountLevelTwo() {
+ return countLevelTwo;
+ }
+
+ public void setCountLevelTwo(long countLevelTwo) {
+ this.countLevelTwo = countLevelTwo;
+ }
+
+ public long getCountScanHistory() {
+ return countScanHistory;
+ }
+
+ public void setCountScanHistory(long countScanHistory) {
+ this.countScanHistory = countScanHistory;
+ }
+
+ public long getCountUserShares() {
+ return countUserShares;
+ }
+
+ public void setCountUserShares(long countUserShares) {
+ this.countUserShares = countUserShares;
+ }
+
+ public long getAccountBindId() {
+ return accountBindId;
+ }
+
+ public void setAccountBindId(long accountBindId) {
+ this.accountBindId = accountBindId;
+ }
public String getAccountAlipay() {
return accountAlipay;
@@ -174,6 +192,14 @@
public void setTotalMoney(double totalMoney) {
this.totalMoney = totalMoney;
+ }
+
+ public long getAccountBindIdWX() {
+ return accountBindIdWX;
+ }
+
+ public void setAccountBindIdWX(long accountBindIdWX) {
+ this.accountBindIdWX = accountBindIdWX;
}
public String getAccountWX() {
@@ -200,20 +226,20 @@
this.totalMoneyWX = totalMoneyWX;
}
- public int getTbNameState() {
- return tbNameState;
+ public int getWxUnionIdState() {
+ return wxUnionIdState;
}
- public void setTbNameState(int tbNameState) {
- this.tbNameState = tbNameState;
+ public void setWxUnionIdState(int wxUnionIdState) {
+ this.wxUnionIdState = wxUnionIdState;
}
- public int getWxNameState() {
- return wxNameState;
+ public int getTaobaoUidState() {
+ return taobaoUidState;
}
- public void setWxNameState(int wxNameState) {
- this.wxNameState = wxNameState;
+ public void setTaobaoUidState(int taobaoUidState) {
+ this.taobaoUidState = taobaoUidState;
}
public int getPhoneState() {
@@ -224,68 +250,12 @@
this.phoneState = phoneState;
}
- public double getTotalMoneyHistory() {
- return totalMoneyHistory;
+ public int getAlipayAccountState() {
+ return alipayAccountState;
}
- public void setTotalMoneyHistory(double totalMoneyHistory) {
- this.totalMoneyHistory = totalMoneyHistory;
- }
-
- public long getCountUserShares() {
- return countUserShares;
- }
-
- public void setCountUserShares(long countUserShares) {
- this.countUserShares = countUserShares;
- }
-
- public long getCountScanHistory() {
- return countScanHistory;
- }
-
- public void setCountScanHistory(long countScanHistory) {
- this.countScanHistory = countScanHistory;
- }
-
- public long getLastOrderTime() {
- return lastOrderTime;
- }
-
- public void setLastOrderTime(long lastOrderTime) {
- this.lastOrderTime = lastOrderTime;
- }
-
- public long getCountLevelOne() {
- return countLevelOne;
- }
-
- public void setCountLevelOne(long countLevelOne) {
- this.countLevelOne = countLevelOne;
- }
-
- public long getCountLevelTwo() {
- return countLevelTwo;
- }
-
- public void setCountLevelTwo(long countLevelTwo) {
- this.countLevelTwo = countLevelTwo;
- }
-
- public long getAccountBindId() {
- return accountBindId;
- }
-
- public void setAccountBindId(long accountBindId) {
- this.accountBindId = accountBindId;
- }
-
- public long getAccountBindIdWX() {
- return accountBindIdWX;
- }
-
- public void setAccountBindIdWX(long accountBindIdWX) {
- this.accountBindIdWX = accountBindIdWX;
+ public void setAlipayAccountState(int alipayAccountState) {
+ this.alipayAccountState = alipayAccountState;
}
}
--
Gitblit v1.8.0