From 1bc8a15f4962eabd73f0fc09cbf7baa31e492158 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Wed, 6 Mar 2024 17:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8E=86=E5=8F=B2operateMan?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cyl/h5/controller/H5OrderController.java    | 9 ---------
 .../src/main/java/com/cyl/h5/service/H5OrderService.java | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java
index 1447189..68db845 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java
@@ -1,6 +1,5 @@
 package com.cyl.h5.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cyl.h5.pojo.dto.ApplyRefundDTO;
 import com.cyl.h5.pojo.dto.OrderCreateDTO;
@@ -13,10 +12,8 @@ import com.cyl.h5.pojo.vo.H5OrderVO;
 import com.cyl.h5.pojo.vo.OrderCalcVO;
 import com.cyl.h5.pojo.vo.form.OrderSubmitForm;
 import com.cyl.h5.service.H5OrderService;
-import com.cyl.manager.oms.domain.Order;
 import com.cyl.manager.ums.domain.Member;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.framework.config.LocalDataUtil;
 import io.swagger.annotations.ApiOperation;
@@ -27,8 +24,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/h5/order")
 @Slf4j
@@ -59,10 +54,6 @@ public class H5OrderController {
             }
         }
     }
-//    @PostMapping("orders")
-//    public ResponseEntity<Page<OrderVO>> queryOrderPage(@RequestBody OrderH5Query query, Pageable pageReq) {
-//        return ResponseEntity.ok(service.queryOrderPage(query, pageReq));
-//    }
 
     @ApiOperation("下单前校验")
     @PostMapping("/addOrderCheck")
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 6eb95a2..940ceb0 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
@@ -220,7 +220,7 @@ public class H5OrderService {
         OrderOperateHistory orderOperateHistory = new OrderOperateHistory();
         orderOperateHistory.setOrderId(orderId);
         orderOperateHistory.setOrderSn(order.getOrderSn());
-        orderOperateHistory.setOperateMan(member.getId() + "");
+        orderOperateHistory.setOperateMan(member.getNickname());
         orderOperateHistory.setOrderStatus(Constants.OrderStatus.NOTPAID);
         orderOperateHistory.setCreateTime(optTime);
         orderOperateHistory.setCreateBy(member.getId());