| @@ -94,7 +94,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| wxOrder.setOrderGroupId(orderGroupId); | wxOrder.setOrderGroupId(orderGroupId); | ||||
| List<WxOrder> list = wxOrderMapper.findList(wxOrder).parallelStream() | List<WxOrder> list = wxOrderMapper.findList(wxOrder).parallelStream() | ||||
| .filter(o -> { | .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()); | o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); | ||||
| }).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
| for (WxOrder temp : list) { | for (WxOrder temp : list) { | ||||
| @@ -204,7 +204,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| wxOrder.setOrderGroupId(wxOrderGroup.getId()); | wxOrder.setOrderGroupId(wxOrderGroup.getId()); | ||||
| wxOrder.setTenantId(wxOrderGroup.getTenantId()); | wxOrder.setTenantId(wxOrderGroup.getTenantId()); | ||||
| List<WxOrder> orderList = wxOrderMapper.select(wxOrder).parallelStream().filter(o -> { | List<WxOrder> 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()); | o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); | ||||
| }).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); | }).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); | ||||
| if (!orderList.isEmpty()) { | if (!orderList.isEmpty()) { | ||||