From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
index 55c659d..9fc07b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
@@ -51,7 +51,21 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime)
+	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime,Integer orderNum)
 			throws Exception;
 
+	/**
+	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑璁㈠崟鏁伴噺澶т簬3
+	 * @param channel
+	 * @param type
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @param orderNum
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Object> countSameDayAndBuyGoodsByChannelAndBuyNum(String channel, Integer type, String years,
+			String startTime, String endTime, Integer orderNum) throws Exception;
+
 }

--
Gitblit v1.8.0