From ee784c98df64ee881d02058a44c0a91df9e9be41 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 11:16:33 +0800
Subject: [PATCH] 订单资金统计数据同步

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 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 6e7ea35..03b9200 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
@@ -22,7 +22,6 @@
 	@Resource
 	private OrderMoneyDailyCountDao orderMoneyDailyCountDao;
 
-	
 	@Override
 	@RequestSerializableByKeyService(key = "#record.uid")
 	public void saveDailyCount(OrderMoneyDailyCount record) {
@@ -30,18 +29,18 @@
 			return; // 鍙傛暟涓嶅叏
 		}
 		String gernalTime = TimeUtil.getGernalTime(record.getCountDay().getTime());
-		String id = StringUtil.Md5(record.getUid() + record.getSourceType().name() + gernalTime);
-		
+		String id = StringUtil.Md5(record.getUid() + "#" + record.getSourceType().name() + "#" + gernalTime);
+
 		// 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) {
+		record.setYearMonth(formatMonth.format(record.getCountDay()));
+
+		OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
+		if (dailyCount != null) {
 			// 閫夋嫨鎬ф洿鏂�
 			orderMoneyDailyCountDao.updateSelective(record);
 		} else {
@@ -57,29 +56,29 @@
 			orderMoneyDailyCountDao.save(record);
 		}
 	}
-	
+
 	@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);
 	}
 }

--
Gitblit v1.8.0