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 | 74 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 42 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 11f0f6c..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,43 +1,33 @@
-package com.yeshi.fanli.dao.mybatis.user;
-
-import java.util.List;
-import java.util.Map;
-
-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);
-
- int updateByPrimaryKeySelective(UserActiveLog record);
-
- int updateByPrimaryKey(UserActiveLog record);
-
- /**
- * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
- * @param channel
- * @return
- */
- List<Map<String, Object>> countSameDayByChannel(@Param("channel")String channel,
- @Param("type")Integer type, @Param("years") String years,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
-
- /**
- * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑鏁伴噺
- * @param channel
- * @return
- */
- List<Map<String, Object>> countSameDayAndBuyGoodsByChannel(@Param("channel")String channel,
- @Param("type")Integer type, @Param("years") String years,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
+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