From 684bf26ee5fc49e9d71e57bc375a5b037555ddf5 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Mon, 24 Jul 2023 12:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=93=8D=E4=BD=9C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=93=8D=E4=BD=9C=E4=BA=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cyl/h5/service/H5OrderService.java    | 6 +++---
 .../main/java/com/cyl/manager/oms/service/OrderService.java | 2 +-
 2 files changed, 4 insertions(+), 4 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 aaef665..4de4a4b 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
@@ -380,7 +380,7 @@ public class H5OrderService {
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());
         optHistory.setOrderSn(order.getOrderSn());
-        optHistory.setOperateMan("用户");
+        optHistory.setOperateMan("" + order.getMemberId());
         optHistory.setOrderStatus(Constants.H5OrderStatus.COMPLETED);
         optHistory.setCreateTime(optDate);
         optHistory.setCreateBy(order.getMemberId());
@@ -426,7 +426,7 @@ public class H5OrderService {
             OrderOperateHistory history = new OrderOperateHistory();
             history.setOrderId(item.getId());
             history.setOrderSn(item.getOrderSn());
-            history.setOperateMan("用户");
+            history.setOperateMan("" + item.getMemberId());
             history.setOrderStatus(Constants.H5OrderStatus.CLOSED);
             history.setCreateTime(optDate);
             history.setCreateBy(userId);
@@ -660,7 +660,7 @@ public class H5OrderService {
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());
         optHistory.setOrderSn(order.getOrderSn());
-        optHistory.setOperateMan("用户");
+        optHistory.setOperateMan("" + memberId);
         optHistory.setOrderStatus(11);
         optHistory.setCreateTime(optDate);
         optHistory.setCreateBy(memberId);
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 b833709..84d58d2 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
@@ -366,7 +366,7 @@ public class OrderService {
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(orderId);
         optHistory.setOrderSn(orderSn);
-        optHistory.setOperateMan(userId + "");
+        optHistory.setOperateMan("后台管理员");
         optHistory.setOrderStatus(orderStatus);
         optHistory.setCreateTime(optDate);
         optHistory.setCreateBy(userId);