Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java

@@ -13,7 +13,6 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoRegisterService;

import com.yeshi.fanli.util.user.ChannelEnumUtil;



@Service

public class UserActiveLogServiceImpl implements UserActiveLogService {

@@ -41,7 +40,7 @@
            UserInfoRegister register = new UserInfoRegister();

            register.setId(userActiveLog.getUid());

            register.setIp(userActiveLog.getIp());

            register.setChannel(ChannelEnumUtil.getChannelEnum(userActiveLog.getChannel()));

            register.setChannel(userActiveLog.getChannel());

            register.setDevice(userActiveLog.getDevice());

            userInfoRegisterService.addRegisterInfo(register);

         } catch (Exception e) {

@@ -85,8 +84,8 @@


   

   @Override

   public long count90DaysLaterActiveNum(String date){

      Long count = userActiveLogMapper.countActiveNumByDate(date);

   public long count90DaysLaterActiveNum(String preDay){

      Long count = userActiveLogMapper.countActiveNumByDate(preDay);

      if (count == null) {

         count = 0L;

      }