Commit 924b28a9 by 田超

Merge branch 'fixbug/nullpointer' into 'master'

bug: [none] 解决查询用户结果为null时的空指针异常

See merge request rays/pcloud-book!968
parents 51ebfe46 3929abc7
...@@ -3,7 +3,6 @@ package com.pcloud.book.cultivate.biz.impl; ...@@ -3,7 +3,6 @@ package com.pcloud.book.cultivate.biz.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.pcloud.appcenter.assist.dto.AssistTempletDTO; import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.vo.SearchBookVO; import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.book.consumer.app.AssistTempletConsr; import com.pcloud.book.consumer.app.AssistTempletConsr;
import com.pcloud.book.consumer.reader.ReaderConsr; import com.pcloud.book.consumer.reader.ReaderConsr;
...@@ -62,9 +61,9 @@ import com.pcloud.common.utils.string.StringUtil; ...@@ -62,9 +61,9 @@ import com.pcloud.common.utils.string.StringUtil;
import com.pcloud.facade.shareimage.dto.HtmlDto; import com.pcloud.facade.shareimage.dto.HtmlDto;
import com.pcloud.facade.shareimage.facade.Htm2ImgService; import com.pcloud.facade.shareimage.facade.Htm2ImgService;
import com.pcloud.readercenter.wechat.entity.WechatUser; import com.pcloud.readercenter.wechat.entity.WechatUser;
import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -75,10 +74,9 @@ import java.util.Date; ...@@ -75,10 +74,9 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.*;
import java.util.stream.Collectors;
@Component("cultivateBiz") @Component("cultivateBiz")
public class CultivateBizImpl implements CultivateBiz { public class CultivateBizImpl implements CultivateBiz {
...@@ -755,6 +753,10 @@ public class CultivateBizImpl implements CultivateBiz { ...@@ -755,6 +753,10 @@ public class CultivateBizImpl implements CultivateBiz {
@Override @Override
public Long getLoginDays(Long wechatUserId) { public Long getLoginDays(Long wechatUserId) {
WechatUser wechatUser = readerConsr.getWechatUser(wechatUserId); WechatUser wechatUser = readerConsr.getWechatUser(wechatUserId);
if (Objects.isNull(wechatUser)){
return 1L;
}
Long dateDiff = DateUtils.getDateDiff(wechatUser.getCreatedDate(), new Date()); Long dateDiff = DateUtils.getDateDiff(wechatUser.getCreatedDate(), new Date());
if(dateDiff==0){ if(dateDiff==0){
return 1L; return 1L;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment