From 5b002db3e9aded110ded993889cb3d81b1eede93 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 13 Mar 2019 11:06:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8E=BB=E6=8B=BC=E5=9B=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxOrderGroupServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 729995d84..92786d035 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -203,8 +203,10 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { wxOrder = new WxOrder(); wxOrder.setOrderGroupId(wxOrderGroup.getId()); wxOrder.setTenantId(wxOrderGroup.getTenantId()); - List orderList = wxOrderMapper.select(wxOrder).parallelStream() - .sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); + List orderList = wxOrderMapper.select(wxOrder).parallelStream().filter(o -> { + return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) && + o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); + }).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); if (!orderList.isEmpty()) { List userList = new ArrayList<>(); for (WxOrder order : orderList) {