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 |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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..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,7 +1,5 @@
 package com.yeshi.fanli.service.inter.user;
 
-import java.util.List;
-
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
 /**
@@ -26,8 +24,19 @@
 	 */
 	public UserActiveLog getUserLatestActiveInfo(Long uid);
 
+	/**
+	 * 鑾峰彇绗竴娆℃椿璺冧俊鎭�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	public UserActiveLog getFirstActiveInfo(Long uid);
 
-	public List<Object> countSameDayByChannel(String channel, Integer type, String years, String startTime, String endTime)
-			throws Exception;
 
+	/**
+	 * 缁熻90鍚庡啀娆℃椿璺冪敤鎴�
+	 * @param date
+	 * @return
+	 */
+	public long count90DaysLaterActiveNum(String date);
 }

--
Gitblit v1.8.0