|
|
@@ -199,7 +199,9 @@ 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); |
|
|
|
|
|
|
|
|
wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); |
|
|
|
|
|
List<WxOrder> orderList = wxOrderMapper.select(wxOrder).parallelStream() |
|
|
|
|
|
.sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); |
|
|
if (!orderList.isEmpty()) { |
|
|
if (!orderList.isEmpty()) { |
|
|
List<Long> ids = new ArrayList<>(); |
|
|
List<Long> ids = new ArrayList<>(); |
|
|
for (WxOrder order : orderList) { |
|
|
for (WxOrder order : orderList) { |
|
|
@@ -231,6 +233,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { |
|
|
order.setTenantId(wxOrderGroup.getTenantId()); |
|
|
order.setTenantId(wxOrderGroup.getTenantId()); |
|
|
order.setCUserId(wxOrderGroup.getUserId()); |
|
|
order.setCUserId(wxOrderGroup.getUserId()); |
|
|
order.setOrderGroupId(wxOrderGroup.getId()); |
|
|
order.setOrderGroupId(wxOrderGroup.getId()); |
|
|
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); |
|
|
int count = wxOrderMapper.selectCount(order); |
|
|
int count = wxOrderMapper.selectCount(order); |
|
|
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(wxOrderGroup.getId()); |
|
|
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(wxOrderGroup.getId()); |
|
|
Map<String, Object> result = new HashMap<>(2); |
|
|
Map<String, Object> result = new HashMap<>(2); |
|
|
|