From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java |   10 ++++++++++
 1 files changed, 10 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 11f0f6c..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
@@ -40,4 +40,14 @@
 	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