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/dao/mybatis/user/UserActiveLogMapper.java |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
index 8b5cdf1..62bae8f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
@@ -1,20 +1,33 @@
-package com.yeshi.fanli.dao.mybatis.user;
-
-import com.yeshi.fanli.entity.bus.user.UserActiveLog;
-
-public interface UserActiveLogMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(UserActiveLog record);
-
-	int insertSelective(UserActiveLog record);
-
-	UserActiveLog selectByPrimaryKey(Long id);
-	
-	UserActiveLog selectLatestByUid(Long uid);
-
-	int updateByPrimaryKeySelective(UserActiveLog record);
-
-	int updateByPrimaryKey(UserActiveLog record);
+package com.yeshi.fanli.dao.mybatis.user;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
+
+public interface UserActiveLogMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(UserActiveLog record);
+
+	int insertSelective(UserActiveLog record);
+
+	UserActiveLog selectByPrimaryKey(Long id);
+
+	UserActiveLog selectLatestByUid(Long uid);
+
+	UserActiveLog selectFirstActiveInfo(Long uid);
+
+	int updateByPrimaryKeySelective(UserActiveLog record);
+
+	int updateByPrimaryKey(UserActiveLog record);
+	
+	
+	/**
+	 * 缁熻褰撳ぉ娲昏穬鐢ㄦ埛涓湁澶氬皯涓敤鎴锋槸90澶╁墠鎵嶆椿璺冭繃锛屾湡闂翠粠鏈椿璺冪殑鐢ㄦ埛鏁伴噺銆�
+	 * @param date
+	 * @return
+	 */
+	Long countActiveNumByDate(@Param("preDay") String preDay);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0