From 90017deb5e101a8057eb3f3e33a68fc039721e2b Mon Sep 17 00:00:00 2001 From: czc Date: Fri, 28 Jul 2023 13:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java | 2 +- .../src/main/java/com/cyl/manager/oms/service/OrderService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index 618c799..5ac4fb4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/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()); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 84d58d2..09d4fd0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/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 orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it)); + Map orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it, (v1,v2) -> v2, LinkedHashMap::new)); //查orderItem QueryWrapper qw = new QueryWrapper<>(); qw.in("order_id", orderMap.keySet());