Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

	
}