|
|
@@ -203,8 +203,10 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { |
|
|
wxOrder = new WxOrder(); |
|
|
wxOrder = new WxOrder(); |
|
|
wxOrder.setOrderGroupId(wxOrderGroup.getId()); |
|
|
wxOrder.setOrderGroupId(wxOrderGroup.getId()); |
|
|
wxOrder.setTenantId(wxOrderGroup.getTenantId()); |
|
|
wxOrder.setTenantId(wxOrderGroup.getTenantId()); |
|
|
List<WxOrder> orderList = wxOrderMapper.select(wxOrder).parallelStream() |
|
|
|
|
|
.sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
List<WxOrder> 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()) { |
|
|
if (!orderList.isEmpty()) { |
|
|
List<WxCUser> userList = new ArrayList<>(); |
|
|
List<WxCUser> userList = new ArrayList<>(); |
|
|
for (WxOrder order : orderList) { |
|
|
for (WxOrder order : orderList) { |
|
|
|