From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java |  105 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
index 24370d2..44c2e3c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
@@ -21,56 +21,117 @@
 	@Resource
 	private OrderMoneyDailyCountDao orderMoneyDailyCountDao;
 
-	
 	@Override
 	@RequestSerializableByKeyService(key = "#record.uid")
 	public void saveDailyCount(OrderMoneyDailyCount record) {
-		if (record.getUid() == null || record.getCountDay() == null || record.getSourceType() == null) {
+		if (record.getUid() == null || record.getCountDay() == null) {
 			return; // 鍙傛暟涓嶅叏
 		}
 		String gernalTime = TimeUtil.getGernalTime(record.getCountDay().getTime());
-		String id = StringUtil.Md5(record.getUid() + record.getSourceType().name() + gernalTime);
-		
-		// id
+		String id = record.getUid() + "#";
+		if (record.getSourceType() != null)
+			id += record.getSourceType().name() + "#";
+		id += gernalTime;
+		id = StringUtil.Md5(id);
+
 		record.setId(id);
 		// 缁熻鏃ユ湡-骞存湀鏃�
 		record.setCountDay(new Date(TimeUtil.convertDateToTemp(gernalTime)));
-		
+
 		SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
-		record.setYearMonth(formatMonth.format(record.getCountDay()) );
-		
-	    OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
-		if (dailyCount == null) {
-			// 閫夋嫨鎬ф洿鏂�
-			orderMoneyDailyCountDao.save(record);
-		} else {
-			// 閫夋嫨鎬ф彃鍏�
+		record.setYearMonth(formatMonth.format(record.getCountDay()));
+
+		OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.get(id);
+		if (dailyCount != null) {
 			orderMoneyDailyCountDao.updateSelective(record);
+		} else {
+			initData(record);
+			record.setUpdateTime(new Date());
+			orderMoneyDailyCountDao.save(record);
 		}
+	}
+
+	private void initData(OrderMoneyDailyCount record) {
+		if (record.getIncome() == null)
+			record.setIncome(0);
+		if (record.getIncomeTeam() == null)
+			record.setIncomeTeam(0);
+		if (record.getOrderNum() == null)
+			record.setOrderNum(0);
+		if (record.getOrderNumTeam() == null)
+			record.setOrderNumTeam(0);
+		if (record.getTeamReward() == null)
+			record.setTeamReward(0);
+		if (record.getTeamRewardNum() == null)
+			record.setTeamRewardNum(0);
+		if (record.getTeamSubsidy() == null)
+			record.setTeamSubsidy(0);
+		if (record.getTeamSubsidyNum() == null)
+			record.setTeamSubsidyNum(0);
+
+		if (record.getDirectOrderNum() == null)
+			record.setDirectOrderNum(0);
+		if (record.getInDirectOrderNum() == null)
+			record.setInDirectOrderNum(0);
+
+		if (record.getBeyondOrderNum() == null)
+			record.setBeyondOrderNum(0);
+	}
+
+	@Override
+	public List<OrderMoneyDailyCount> getByUid(Long uid) {
+		return orderMoneyDailyCountDao.query(uid, null, null);
 	}
 	
 	@Override
 	public List<OrderMoneyDailyCount> query(Long uid, Date minDay, Date maxDay) {
 		return orderMoneyDailyCountDao.query(uid, minDay, maxDay);
 	}
-	
+
 	@Override
-	public List<OrderMoneyDailyCount>  sumGroupBySourceType(Long uid, Date minDay, Date maxDay) {
+	public List<OrderMoneyDailyCount> sumGroupBySourceType(Long uid, Date minDay, Date maxDay) {
 		return orderMoneyDailyCountDao.sumGroupBySourceType(uid, minDay, maxDay);
 	}
-	
+
 	@Override
-	public List<OrderMoneyDailyCount>  sumTeamGroupBySourceType(Long uid, Date minDay, Date maxDay) {
+	public List<OrderMoneyDailyCount> sumTeamGroupBySourceType(Long uid, Date minDay, Date maxDay) {
 		return orderMoneyDailyCountDao.sumTeamGroupBySourceType(uid, minDay, maxDay);
 	}
-	
+
 	@Override
-	public List<OrderMoneyDailyCount>  sumGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+	public List<OrderMoneyDailyCount> sumGroupByCountDay(Long uid, Date minDay, Date maxDay) {
 		return orderMoneyDailyCountDao.sumGroupByCountDay(uid, minDay, maxDay);
 	}
-	
+
 	@Override
-	public List<OrderMoneyDailyCount>  sumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+	public List<OrderMoneyDailyCount> sumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
 		return orderMoneyDailyCountDao.sumGroupByYearMonth(uid, minDay, maxDay);
 	}
+
+	@Override
+	public List<OrderMoneyDailyCount> sumTeamGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+		return orderMoneyDailyCountDao.sumTeamGroupByCountDay(uid, minDay, maxDay);
+	}
+
+	@Override
+	public List<OrderMoneyDailyCount> sumTeamGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+		return orderMoneyDailyCountDao.sumTeamGroupByYearMonth(uid, minDay, maxDay);
+	}
+	
+	@Override
+	public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+		return orderMoneyDailyCountDao.sumTeamOrderNumGroupByCountDay(uid, minDay, maxDay);
+	}
+	
+	@Override
+	public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+		return orderMoneyDailyCountDao.sumTeamOrderNumGroupByYearMonth(uid, minDay, maxDay);
+	}
+	
+	
+	@Override
+	public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByUid(Long uid, Date minDay, Date maxDay) {
+		return orderMoneyDailyCountDao.sumTeamOrderNumGroupByUid(uid, minDay, maxDay);
+	}
+	
 }

--
Gitblit v1.8.0