| @@ -226,15 +226,19 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| List<WxCUser> userList = new ArrayList<>(); | List<WxCUser> userList = new ArrayList<>(); | ||||
| for (WxOrder order : orderList) { | for (WxOrder order : orderList) { | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | ||||
| userList.add(user); | |||||
| if (user != null) { | |||||
| userList.add(user); | |||||
| } | |||||
| } | |||||
| if (!userList.isEmpty()) { | |||||
| userList = userList.parallelStream().map(u -> { | |||||
| WxCUser temp = new WxCUser(); | |||||
| temp.setId(u.getId()); | |||||
| temp.setNickName(u.getNickName()); | |||||
| temp.setAvatarUrl(u.getAvatarUrl()); | |||||
| return temp; | |||||
| }).collect(Collectors.toList()); | |||||
| } | } | ||||
| userList = userList.parallelStream().map(u -> { | |||||
| WxCUser temp = new WxCUser(); | |||||
| temp.setId(u.getId()); | |||||
| temp.setNickName(u.getNickName()); | |||||
| temp.setAvatarUrl(u.getAvatarUrl()); | |||||
| return temp; | |||||
| }).collect(Collectors.toList()); | |||||
| couponOrderGroup.put("userList", userList); | couponOrderGroup.put("userList", userList); | ||||
| } | } | ||||
| return new ResultData(couponOrderGroup); | return new ResultData(couponOrderGroup); | ||||