|
|
@@ -805,12 +805,14 @@ public class OrderController extends BladeController {
|
|
|
for (Map.Entry<String, List<PjOrder>> orderMap : map.entrySet()) {
|
|
|
Map<String, Object> objectMap = new HashMap<>(2);
|
|
|
objectMap.put("name", orderMap.getKey());
|
|
|
- objectMap.put("list", orderMap.getValue());
|
|
|
mapList.add(objectMap);
|
|
|
if (orderMap.getValue().isEmpty()) {
|
|
|
+ objectMap.put("list", Collections.EMPTY_LIST);
|
|
|
continue;
|
|
|
}
|
|
|
- for (PjOrder order : orderMap.getValue()) {
|
|
|
+ List<PjOrder> nowOrderList = orderMap.getValue().stream().sorted(Comparator.comparing(PjOrder::getCreateTime).reversed()).collect(Collectors.toList());
|
|
|
+ objectMap.put("list", nowOrderList);
|
|
|
+ for (PjOrder order : nowOrderList) {
|
|
|
List<PjOrderItems> nowOrderItemList = pjOrderItemsList.stream().filter(item -> order.getId().equals(item.getPid())).collect(Collectors.toList());
|
|
|
order.setOrderItemsList(nowOrderItemList);
|
|
|
for (PjOrderItems item : nowOrderItemList) {
|