From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 21ef522..9cba217 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
@@ -31,4 +31,23 @@
 	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);
+	
+	/**
+	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑璁㈠崟鏁伴噺澶т簬3
+	 * @param channel
+	 * @return
+	 */
+	List<Map<String, Object>> countSameDayAndBuyGoodsByChannelAndBuyNum(@Param("channel")String channel,
+			@Param("type")Integer type, @Param("years") String years, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime,
+			@Param("orderNum")Integer orderNum);
 }
\ No newline at end of file

--
Gitblit v1.8.0