diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index c21b82d6..5eaea6bc 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -3094,12 +3094,22 @@ public class HighOrderServiceImpl implements HighOrderService { List list = highOrderMapper.selectByExample(example); - for (HighOrder order : list) { - HighUser user = highUserService.findByUserId(order.getIdentificationCode()); - order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm")); - List childOrder = getChildOrderByOrder(order.getId()); - order.setGoodsTypeName("购买:" + GoodsType.getNameByType(childOrder.get(0).getGoodsType())); - order.setAgentName(user.getName()); + if (list.size() > 0) { + for (HighOrder order : list) { + HighUser user = highUserService.findByUserId(order.getIdentificationCode()); + order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm")); + List childOrder = getChildOrderByOrder(order.getId()); + order.setGoodsTypeName("购买:" + GoodsType.getNameByType(childOrder.get(0).getGoodsType())); + if (user != null) { + order.setAgentName(user.getName()); + } else { + if (order.getIdentificationCode() == 60) { + order.setAgentName("贵州汇联通"); + } else { + order.setAgentName("暂无推广人"); + } + } + } } return list;