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/service/impl/count/CommonOrderCountServiceImpl.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index f7aa9e0..6a9e6b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -224,9 +224,21 @@
 	}
 	
 	@Override
+	public List<Long> getUidByValidOrderByDay(String preDay) {
+		return commonOrderCountMapper.getUidByValidOrderByDay(preDay);
+	}
+	
+	
+	@Override
 	public Integer countDownOrderUserByUidAndDate(Date preDay, List<Long> list) {
 		return commonOrderCountMapper.countDownOrderUserByUidAndDate(preDay, list);
 	}
+	
+	@Override
+	public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list) {
+		return commonOrderCountMapper.getDownOrderUserByListUidAndDate(preDay, list);
+	}
+	
 	
 	@Override
 	public List<CountOrderDTO> countCommissionByDay(String preDay) {
@@ -330,6 +342,21 @@
 		record.setId(StringUtil.Md5(preDay + trackRateEnum.name()));
 		countOrderTrackRateDao.save(record);
 	}
+	
 		
+	@Override
+	public Long countOrderBySourceTypeAndDay(int source, String preDay) {
+		return commonOrderCountMapper.countOrderBySourceTypeAndDay(preDay, source);
+	}
+	
+	@Override
+	public long countOrderBySourceAndNearDay(Long uid, int source, int day) {
+		Long count = commonOrderCountMapper.countOrderBySourceAndNearDay(uid, source, day);
+		if (count  == null) {
+			count = 0L;
+		}
+		return count;
+	}
+	
 	
 }

--
Gitblit v1.8.0