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 92786d035..a9b40ef3a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -94,7 +94,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { wxOrder.setOrderGroupId(orderGroupId); List list = wxOrderMapper.findList(wxOrder).parallelStream() .filter(o -> { - return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) && + return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); }).collect(Collectors.toList()); for (WxOrder temp : list) { @@ -204,7 +204,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { wxOrder.setOrderGroupId(wxOrderGroup.getId()); wxOrder.setTenantId(wxOrderGroup.getTenantId()); List orderList = wxOrderMapper.select(wxOrder).parallelStream().filter(o -> { - return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) && + 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()) {