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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java

@@ -1,9 +1,10 @@
package com.yeshi.fanli.service.inter.user;



import java.util.Date;

import java.util.List;

import java.util.Map;



import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.bus.user.UserActiveNumHistory;



/**

 * 用户活跃日志服务

@@ -28,35 +29,22 @@
   public UserActiveLog getUserLatestActiveInfo(Long uid);



   /**

    * 根据渠道   统计当日新增用户数量

    * @param channel

    * 获取第一次活跃信息

    * 
    * @param uid

    * @return

    */

   public List<Map<String, Object>> countSameDayByChannel(String channel, Integer type, String years, 
         String startTime, String endTime) throws Exception;

   /**

    * 根据渠道   统计当日新增用户有购买行为的数量

    * @param channel

    * @return

    */

   public List<Object> countSameDayAndBuyGoodsByChannel(String channel, Integer type, String years, String startTime,

         String endTime) throws Exception;

   public UserActiveLog getFirstActiveInfo(Long uid);



   /**

    * 当日产生订单的新增用户 与 当日总新增用户比例

    * @param channel

    * @param type

    * @param years

    * 
    * @param dateType

    * @param year

    * @param startTime

    * @param endTime

    * @return

    * @throws Exception

    */

   public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime,Integer orderNum)

         throws Exception;

   public List<UserActiveNumHistory> query(Date startTime, Date endTime);





   public List<Map<String, Object>> countOneWeekUserInfo(String channel, String startTime, String endTime, Integer orderNumber)

         throws Exception;



   public void addUserActiveNumHistory(String date);

}