记得上下班打卡 | git大法好,push需谨慎

Commit 582f8bee authored by wyf's avatar wyf

1.规范调用 2.空指针报错优化

parent c7153a4f
...@@ -7,7 +7,6 @@ import com.liquidnet.service.base.ResponseDto; ...@@ -7,7 +7,6 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.UserPathDto; import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo; import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
import com.liquidnet.service.goblin.dto.vo.NoticeGoblinMixDetailsVo; import com.liquidnet.service.goblin.dto.vo.NoticeGoblinMixDetailsVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
...@@ -33,7 +32,6 @@ import org.apache.commons.lang3.StringUtils; ...@@ -33,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
...@@ -72,10 +70,6 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -72,10 +70,6 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
@Autowired @Autowired
private QueueUtils queueUtils; private QueueUtils queueUtils;
@Autowired
@Lazy
private FeignAdamBaseClient feignAdamBaseClient;
@Value("${liquidnet.service.smile.url}") @Value("${liquidnet.service.smile.url}")
private String smileUrl; private String smileUrl;
...@@ -222,19 +216,16 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -222,19 +216,16 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
return newList; return newList;
} }
private boolean isVip() { private Integer isVip() {
final String currentUid = CurrentUtil.getCurrentUid(); final String currentUid = CurrentUtil.getCurrentUid();
if (!StringUtils.isBlank(currentUid)) { if (!StringUtils.isBlank(currentUid)) {
try { try {
ResponseDto<Boolean> member = feignAdamBaseClient.isMember(currentUid); return dataUtils.isMemberByUser(currentUid);
if (member.isSuccess()) {
return member.getData();
}
} catch (Exception e) { } catch (Exception e) {
log.error("获取用户会员状态错误。", e); log.error("获取用户会员状态错误。", e);
} }
} }
return false; return 0;
} }
public HashMap<String, Object> setNoticeIds() { public HashMap<String, Object> setNoticeIds() {
......
...@@ -1568,7 +1568,7 @@ public class DataUtils { ...@@ -1568,7 +1568,7 @@ public class DataUtils {
public Integer isMemberByUser(String uid) { public Integer isMemberByUser(String uid) {
Integer isMember=0; Integer isMember=0;
AdamUserMemberVo userMemberVo = getUserMemberVoByUid(uid); AdamUserMemberVo userMemberVo = getUserMemberVoByUid(uid);
if (null!=isMember && userMemberVo.isActive()){ if (null != userMemberVo && userMemberVo.isActive()){
isMember=1; isMember=1;
} }
return isMember; return isMember;
......
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