From 8b3c82c0788e23acd889e6f67a91c855693352fd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 16:38:29 +0800
Subject: [PATCH] 团队分红统计

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
index 2725b03..4425fd6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
@@ -56,8 +56,6 @@
 			record.setStateValid(false);
 		if (record.getTaobaoBind() == null)
 			 record.setTaobaoBind(false);
-		if (record.getWeixinBind() == null)
-			record.setWeixinBind(false);
 		if (record.getWeixinId() == null)
 			record.setWeixinId("");
 		if (record.getPhone() == null)
@@ -71,7 +69,7 @@
 		if (record.getFansNum() == null)
 			record.setFansNum(0);
 		if (record.getIncome() != null)
-			record.setIncome(BigDecimal.ZERO);
+			record.setIncome(0);
 		if (record.getIncomeTime() == null)
 			record.setIncomeTime(new Date());
 		if (record.getMemoName() == null)
@@ -82,6 +80,13 @@
 			record.setMemoNameSup("");
 		if (record.getTagsSup() == null)
 			record.setTagsSup("");
+		
+		if (StringUtil.isNullOrEmpty(record.getWeixinId())) {
+			record.setWeixinIdExist(false);
+		} else {
+			record.setWeixinIdExist(true);
+		}
+			
 	}
 	
 	
@@ -137,14 +142,6 @@
 	}
 	
 	@Override
-	public void updateWeixinBind(Long workerId, boolean weixinBind) {
-		TeamFansInfo teamFansInfo = new TeamFansInfo();
-		teamFansInfo.setWorkerId(workerId);
-		teamFansInfo.setWeixinBind(weixinBind);
-		save(teamFansInfo);
-	}
-
-	@Override
 	public void updateActiveTime(Long workerId, Date activeTime) {
 		TeamFansInfo teamFansInfo = new TeamFansInfo();
 		teamFansInfo.setWorkerId(workerId);
@@ -158,6 +155,11 @@
 		TeamFansInfo teamFansInfo = new TeamFansInfo();
 		teamFansInfo.setWorkerId(workerId);
 		teamFansInfo.setWeixinId(weixinId);
+		if (StringUtil.isNullOrEmpty(weixinId)) {
+			teamFansInfo.setWeixinIdExist(false);
+		} else {
+			teamFansInfo.setWeixinIdExist(true);
+		}
 		save(teamFansInfo);
 	}
 	
@@ -189,9 +191,13 @@
 	
 	@Override
 	public void updateIncome(Long workerId, BigDecimal income) {
+		if (income == null) {
+			income = BigDecimal.ZERO;
+		}
+		
 		TeamFansInfo teamFansInfo = new TeamFansInfo();
 		teamFansInfo.setWorkerId(workerId);
-		teamFansInfo.setIncome(income);
+		teamFansInfo.setIncome(income.multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue());
 		teamFansInfo.setIncomeTime(new Date());
 		save(teamFansInfo);
 	}

--
Gitblit v1.8.0