From f53edec193227af90aad11f557723e72b4860400 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 03 一月 2019 18:18:21 +0800
Subject: [PATCH] 冲突处理

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 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 a5d0d82..55c659d 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
@@ -26,8 +26,32 @@
 	 */
 	public UserActiveLog getUserLatestActiveInfo(Long uid);
 
-
+	/**
+	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
+	 * @param channel
+	 * @return
+	 */
 	public List<Object> countSameDayByChannel(String channel, Integer type, String years, String startTime, String endTime)
 			throws Exception;
+	/**
+	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑鏁伴噺
+	 * @param channel
+	 * @return
+	 */
+	public List<Object> countSameDayAndBuyGoodsByChannel(String channel, Integer type, String years, String startTime,
+			String endTime) throws Exception;
+
+	/**
+	 * 褰撴棩浜х敓璁㈠崟鐨勬柊澧炵敤鎴� 涓� 褰撴棩鎬绘柊澧炵敤鎴锋瘮渚�
+	 * @param channel
+	 * @param type
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime)
+			throws Exception;
 
 }

--
Gitblit v1.8.0