From 34524bf1d7283f280a4c7a92ca2770710dcef78b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Mar 2019 17:12:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E5=90=8E=E7=9A=84=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxOrderGroupServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index c69a79acf..0ace5279c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -226,15 +226,19 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { List userList = new ArrayList<>(); for (WxOrder order : orderList) { 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); } return new ResultData(couponOrderGroup);