Merge remote-tracking branch 'origin/master'

admin

2019-01-05 407157c46e82f44b592ad18dd4367bc19209f909

 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);
}