From 5797fc7e8267d634ee64fd27cdea2a834091681e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 11:10:24 +0800
Subject: [PATCH] Merge branch 'master' into dev-msg

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java |   33 ---------------------------------
 1 files changed, 0 insertions(+), 33 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 468c905..8b5cdf1 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,11 +1,5 @@
 package com.yeshi.fanli.dao.mybatis.user;
 
-import java.math.BigDecimal;
-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 {
@@ -23,31 +17,4 @@
 	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);
-	
-	/**
-	 * 缁熻
-	 * @param channel
-	 * @return
-	 */
-	Map<String, BigDecimal> countOneWeekUserInfo(@Param("channel")String channel,
-			@Param("startTime")String startTime, @Param("endTime")String endTime,
-			@Param("orderNumber")Integer orderNumber);
 }
\ No newline at end of file

--
Gitblit v1.8.0