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/user/UserActiveLogService.java |   36 ++++++++----------------------------
 1 files changed, 8 insertions(+), 28 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 ca3fc33..1bc4739 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,8 +1,5 @@
 package com.yeshi.fanli.service.inter.user;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
 /**
@@ -28,35 +25,18 @@
 	public UserActiveLog getUserLatestActiveInfo(Long uid);
 
 	/**
-	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
-	 * @param channel
+	 * 鑾峰彇绗竴娆℃椿璺冧俊鎭�
+	 * 
+	 * @param uid
 	 * @return
 	 */
-	public List<Map<String, 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;
+	public UserActiveLog getFirstActiveInfo(Long uid);
+
 
 	/**
-	 * 褰撴棩浜х敓璁㈠崟鐨勬柊澧炵敤鎴� 涓� 褰撴棩鎬绘柊澧炵敤鎴锋瘮渚�
-	 * @param channel
-	 * @param type
-	 * @param years
-	 * @param startTime
-	 * @param endTime
+	 * 缁熻90鍚庡啀娆℃椿璺冪敤鎴�
+	 * @param date
 	 * @return
-	 * @throws Exception
 	 */
-	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime,Integer orderNum)
-			throws Exception;
-
-
-	public List<Map<String, Object>> countOneWeekUserInfo(String channel, String startTime, String endTime, Integer orderNumber)
-			throws Exception;
-
+	public long count90DaysLaterActiveNum(String date);
 }

--
Gitblit v1.8.0