fanli-server.git

			@@ -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;

			// 支付包绑定id

			// 绑定支付包id
			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;
			}

			}