Commit 447ba62c authored by zhangfeng's avatar zhangfeng

Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

parents fcec6796 a92c3666
...@@ -421,10 +421,13 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i ...@@ -421,10 +421,13 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
nodes = nodeApi.getNodesByCity(null, 130L); nodes = nodeApi.getNodesByCity(null, 130L);
} else { } else {
nodes = nodeApi.getNodesByCity(user.getCity().longValue(), null); nodes = nodeApi.getNodesByCity(user.getCity().longValue(), null);
if (CollectionUtil.isEmpty(nodes)) {
nodes = nodeApi.getNodesByCity(null, user.getCountry().longValue());
}
} }
if (CollectionUtil.isNotEmpty(nodes)) { if (CollectionUtil.isEmpty(nodes)) {
return nodes.stream().map(NodeRespDTO::getId).collect(Collectors.toList()); nodes = nodeApi.getNodesByCity(null, 130L);
} }
return Collections.emptyList(); return nodes.stream().map(NodeRespDTO::getId).collect(Collectors.toList());
} }
} }
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