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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -9,7 +9,9 @@


import com.yeshi.fanli.dao.mybatis.user.UserInfoRegisterMapper;

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

import com.yeshi.fanli.entity.system.ChannelEnum;

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

import com.yeshi.fanli.util.StringUtil;



@Service

public class UserInfoRegisterServiceImpl implements UserInfoRegisterService {

@@ -28,8 +30,18 @@
      if (info != null) 

         return;

      

      if (StringUtil.isNullOrEmpty(record.getChannel())) {

         record.setChannel(ChannelEnum.unknown.getVlaue());

      }

		
      record.setCreateTime(new Date());

      userInfoRegisterMapper.insertSelective(record);

   }

	
	
   @Override

   public UserInfoRegister selectByPrimaryKey(Long uid) {

      return userInfoRegisterMapper.selectByPrimaryKey(uid);

   }

   

   

@@ -44,6 +56,10 @@
      return userInfoRegisterMapper.listByMultipleUidAndDay(list, preDay);

   }

   

   @Override

   public List<UserInfoRegister> listByDay(String preDay) {

      return userInfoRegisterMapper.listByDay(preDay);

   }

   

   @Override

   public List<UserInfoRegister> listByChannelAndDay(String channel, String preDay) {