Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;



import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -15,6 +16,23 @@
   

   @Resource

   private UserInfoRegisterMapper userInfoRegisterMapper;

	
	
   @Override

   public void addRegisterInfo(UserInfoRegister record) {

      if (record == null || record.getId() == null) {

         return;

      }

		
      UserInfoRegister info = userInfoRegisterMapper.selectByPrimaryKey(record.getId());

      if (info != null) 
         return;

		
      record.setCreateTime(new Date());

      userInfoRegisterMapper.insertSelective(record);

   }

	
	
   

   @Override

   public List<UserInfoRegister> listByMultipleUids(List<Long> list) {

@@ -44,7 +62,7 @@
   

   

   @Override

   public Integer countByChannelAndDay(String channel, String preDay) {

   public Long countByChannelAndDay(String channel, String preDay) {

      return userInfoRegisterMapper.countByChannelAndDay(channel, preDay);

   }

}