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/inter/order/CommonOrderCountService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
index 14d4158..60d3302 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
@@ -199,12 +199,27 @@
 	 */
 	public Integer countOderByUidAndLess10(Long uid);
 	
+
+
+	public Long countOrderBySourceTypeAndDay(int source, String preDay);
+
+
+	public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list);
+
 	/**
-	 * 缁熻鎵�鏈夎鍗�
-	 * 
-	 * @param channel
+	 * 鏌ヨ褰撴棩涓嬪崟鐢ㄦ埛
+	 * @param preDay
 	 * @return
 	 */
-	public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
-			int sourceType) throws Exception;
+	public List<Long> getUidByValidOrderByDay(String preDay);
+
+
+	/**
+	 * 缁熻鏈�杩慸ay澶╂湁鏁堣鍗曟暟閲�
+	 * @param uid
+	 * @param source
+	 * @param day
+	 * @return
+	 */
+	public long countOrderBySourceAndNearDay(Long uid, int source, int day);
 }

--
Gitblit v1.8.0