From b843e1c35f5bd1d8497321c2ce139893998e89c9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 12 五月 2020 19:57:21 +0800
Subject: [PATCH] 队员统计

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java |   61 +++++++++++-------------------
 1 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java
index 30d354f..3dda437 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java
@@ -9,15 +9,12 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.user.invite.TeamDailyRecordDao;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.vip.TeamDailyRecord;
+import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord;
 import com.yeshi.fanli.exception.user.TeamDailyRecordException;
-import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.user.invite.TeamDailyRecordService;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 
 @Service
 public class TeamDailyRecordServiceImpl implements TeamDailyRecordService {
@@ -41,7 +38,7 @@
 		
 		// id
 		record.setId(id);
-		TeamDailyRecord teamDaily = teamDailyRecordDao.getById(id);
+		TeamDailyRecord teamDaily = teamDailyRecordDao.get(id);
 		if (teamDaily != null) {
 			teamDailyRecordDao.updateSelective(record);
 		} else {
@@ -51,45 +48,31 @@
 			teamDailyRecordDao.save(record);
 		}
 	}
+
+	@Override
+	public String createId(Long uid, Date date) {
+		String gernalTime = TimeUtil.getGernalTime(date.getTime());
+		return StringUtil.Md5(uid + "#" + gernalTime);
+	}
 	
-
+	
 	@Override
-	@RequestSerializableByKeyService(key = "#uid")
-	public void addDailyRecord(Long uid) {
-		// 閲嶆柊缁熻闃熷憳绛夌骇鏁伴噺
-		recountRecord(uid);
-
-		// 缁熻涓婄骇闃熷憳鏁伴噺
-		ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);
-		if (threeSale != null) {
-			recountRecord(threeSale.getBoss().getId());
-		}
-	}
-
-	private void recountRecord(Long uid) {
-		try {
-			// 鐩存帴绮変笣
-			int firstCount = (int) threeSaleSerivce.countFirstTeamByDate(uid, 1);
-			// 闂存帴绮変笣
-			int secondCount = (int) threeSaleSerivce.countSecondTeamByDate(uid, 1);
-
-			int secondBeyond = 0;
-			
-		 
-		} catch (Exception e) {
-			e.getSuppressed();
-			LogHelper.errorDetailInfo(e);
-		}
-	}
-
-	@Override
-	public List<TeamDailyRecord> getbyUid(Long uid) {
-		return teamDailyRecordDao.getbyUid(uid);
+	public TeamDailyRecord getById(String id) {
+		return teamDailyRecordDao.get(id);
 	}
 	
 	@Override
-	public List<TeamDailyRecord> getbyUid(Long uid, Date minTime) {
-		return teamDailyRecordDao.getbyUid(uid, minTime);
+	public List<TeamDailyRecord> getByUid(Long uid) {
+		return teamDailyRecordDao.getByUid(uid);
 	}
 	
+	@Override
+	public List<TeamDailyRecord> listByUid(Long uid, Date minTime, Date maxTime) {
+		return teamDailyRecordDao.listByUid(uid, minTime, maxTime);
+	}
+	
+	@Override
+	public List<TeamDailyRecord> sumGroupByYearMonth(Long uid, Date minTime, Date maxTime) {
+		return teamDailyRecordDao.sumGroupByYearMonth(uid, minTime, maxTime);
+	}
 }

--
Gitblit v1.8.0