订单分页查询按时间降序

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -566,7 +566,7 @@ public class H5OrderService {
                 OrderOperateHistory optHistory = new OrderOperateHistory();
                 optHistory.setOrderId(order.getId());
                 optHistory.setOrderSn(order.getOrderSn());
-                optHistory.setOperateMan("系统");
+                optHistory.setOperateMan("" + order.getMemberId());
                 optHistory.setOrderStatus(OrderStatus.NOT_DELIVERED.getType());
                 optHistory.setCreateTime(optDate);
                 optHistory.setCreateBy(order.getMemberId());

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java

@@ -176,7 +176,7 @@ public class OrderService {
             return new PageImpl<>(managerOrderVOList, page, 0);
         }
         long total = ((com.github.pagehelper.Page) managerOrderVOList).getTotal();
-        Map<Long, ManagerOrderVO> orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it));
+        Map<Long, ManagerOrderVO> orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it, (v1,v2) -> v2, LinkedHashMap::new));
         //查orderItem
         QueryWrapper<OrderItem> qw = new QueryWrapper<>();
         qw.in("order_id", orderMap.keySet());