From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |   30 ------------------------------
 1 files changed, 0 insertions(+), 30 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..3ffe7c0 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
@@ -1,7 +1,5 @@
 package com.yeshi.fanli.service.inter.user;
 
-import java.util.List;
-
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
 /**
@@ -25,33 +23,5 @@
 	 * @return
 	 */
 	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