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/bus/user/TeamFansInfo.java |  206 +++++++++++++++++++++++++++------------------------
 1 files changed, 110 insertions(+), 96 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TeamFansInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TeamFansInfo.java
index 99362a1..6925c2b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TeamFansInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TeamFansInfo.java
@@ -1,9 +1,9 @@
 package com.yeshi.fanli.entity.bus.user;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
@@ -17,12 +17,15 @@
 	private String id;
 
 	@Field
+	@Indexed
 	private Long bossId; // 涓婄骇id
 
 	@Field
+	@Indexed
 	private Long bossSuperId; // 涓婁笂绾d
 
 	@Field
+	@Indexed
 	private Long workerId; // 涓嬬骇id
 
 	@Field
@@ -38,10 +41,10 @@
 	private Boolean taobaoBind; // 缁戝畾娣樺疂
 
 	@Field
-	private Boolean weixinBind; // 缁戝畾寰俊
+	private String weixinId; // 寰俊鍙�
 
 	@Field
-	private String weixinId; // 寰俊鍙�
+	private Boolean weixinIdExist; // 濉啓寰俊鍙�
 
 	@Field
 	private String phone; // 鐢佃瘽鍙风爜
@@ -59,7 +62,7 @@
 	private Integer fansNum; // 绮変笣鏁伴噺
 
 	@Field
-	private BigDecimal income; // 璐︽埛鏀跺叆
+	private Integer income; // 璐︽埛鏀跺叆 涔樹互100
 
 	@Field
 	private Date incomeTime; // 璐︽埛鏀跺叆缁熻鏃堕棿
@@ -79,6 +82,9 @@
 	@Field
 	private String tagsSup; // 闂存帴涓婄骇鏍囩
 
+	@Field
+	private Date crateTime; // 鍒涘缓鏃堕棿
+	
 	@Field
 	private Date updateTime; // 鏇存柊鏃堕棿
 
@@ -122,20 +128,12 @@
 		this.nickName = nickName;
 	}
 
-	public String getMemoName() {
-		return memoName;
+	public UserLevelEnum getLevel() {
+		return level;
 	}
 
-	public void setMemoName(String memoName) {
-		this.memoName = memoName;
-	}
-
-	public String getTags() {
-		return tags;
-	}
-
-	public void setTags(String tags) {
-		this.tags = tags;
+	public void setLevel(UserLevelEnum level) {
+		this.level = level;
 	}
 
 	public Boolean getStateValid() {
@@ -154,92 +152,20 @@
 		this.taobaoBind = taobaoBind;
 	}
 
-	public Boolean getWeixinBind() {
-		return weixinBind;
-	}
-
-	public void setWeixinBind(Boolean weixinBind) {
-		this.weixinBind = weixinBind;
-	}
-
-	public Date getActiveTime() {
-		return activeTime;
-	}
-
-	public void setActiveTime(Date activeTime) {
-		this.activeTime = activeTime;
-	}
-
-	public Integer getFansNum() {
-		return fansNum;
-	}
-
-	public void setFansNum(Integer fansNum) {
-		this.fansNum = fansNum;
-	}
-
-	public BigDecimal getIncome() {
-		return income;
-	}
-
-	public void setIncome(BigDecimal income) {
-		this.income = income;
-	}
-
-	public Date getIncomeTime() {
-		return incomeTime;
-	}
-
-	public void setIncomeTime(Date incomeTime) {
-		this.incomeTime = incomeTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Date getJoinTime() {
-		return joinTime;
-	}
-
-	public void setJoinTime(Date joinTime) {
-		this.joinTime = joinTime;
-	}
-
-	public String getMemoNameSup() {
-		return memoNameSup;
-	}
-
-	public void setMemoNameSup(String memoNameSup) {
-		this.memoNameSup = memoNameSup;
-	}
-
-	public String getTagsSup() {
-		return tagsSup;
-	}
-
-	public void setTagsSup(String tagsSup) {
-		this.tagsSup = tagsSup;
-	}
-
-	public UserLevelEnum getLevel() {
-		return level;
-	}
-
-	public void setLevel(UserLevelEnum level) {
-		this.level = level;
-	}
-
 	public String getWeixinId() {
 		return weixinId;
 	}
 
 	public void setWeixinId(String weixinId) {
 		this.weixinId = weixinId;
+	}
+
+	public Boolean getWeixinIdExist() {
+		return weixinIdExist;
+	}
+
+	public void setWeixinIdExist(Boolean weixinIdExist) {
+		this.weixinIdExist = weixinIdExist;
 	}
 
 	public String getPhone() {
@@ -266,4 +192,92 @@
 		this.inviteCode = inviteCode;
 	}
 
+	public Date getActiveTime() {
+		return activeTime;
+	}
+
+	public void setActiveTime(Date activeTime) {
+		this.activeTime = activeTime;
+	}
+
+	public Integer getFansNum() {
+		return fansNum;
+	}
+
+	public void setFansNum(Integer fansNum) {
+		this.fansNum = fansNum;
+	}
+
+	public Integer getIncome() {
+		return income;
+	}
+
+	public void setIncome(Integer income) {
+		this.income = income;
+	}
+
+	public Date getIncomeTime() {
+		return incomeTime;
+	}
+
+	public void setIncomeTime(Date incomeTime) {
+		this.incomeTime = incomeTime;
+	}
+
+	public Date getJoinTime() {
+		return joinTime;
+	}
+
+	public void setJoinTime(Date joinTime) {
+		this.joinTime = joinTime;
+	}
+
+	public String getMemoName() {
+		return memoName;
+	}
+
+	public void setMemoName(String memoName) {
+		this.memoName = memoName;
+	}
+
+	public String getTags() {
+		return tags;
+	}
+
+	public void setTags(String tags) {
+		this.tags = tags;
+	}
+
+	public String getMemoNameSup() {
+		return memoNameSup;
+	}
+
+	public void setMemoNameSup(String memoNameSup) {
+		this.memoNameSup = memoNameSup;
+	}
+
+	public String getTagsSup() {
+		return tagsSup;
+	}
+
+	public void setTagsSup(String tagsSup) {
+		this.tagsSup = tagsSup;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Date getCrateTime() {
+		return crateTime;
+	}
+
+	public void setCrateTime(Date crateTime) {
+		this.crateTime = crateTime;
+	}
+
 }

--
Gitblit v1.8.0