From d23d2c74e77002e39c47aa18a3b633c9c517261a Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 28 Nov 2024 11:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/order/controller/OrderController.java    | 6 +++---
 .../com/bonus/material/order/domain/OrderDetailDto.java     | 2 +-
 .../java/com/bonus/material/order/mapper/OrderMapper.java   | 2 +-
 .../resources/mapper/material/order/OrderInfoMapper.xml     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
index f29d9c9..40114c7 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
@@ -65,7 +65,7 @@ public class OrderController extends BaseController {
         if (dto.getId() != null) {
             OrderInfoDto orderInfoDto = orderService.getOrderDetailsById(dto);
             return success(orderInfoDto);
-        }else {
+        } else {
             return error("参数错误");
         }
     }
@@ -76,8 +76,8 @@ public class OrderController extends BaseController {
     @ApiOperation(value = "订单状态流转修改")
     @PostMapping("/updateOrderStatus")
     public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) {
-        Long userId = SecurityUtils.getLoginUser().getUserid();
-        Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus(),userId);
+        String userName = SecurityUtils.getLoginUser().getUsername();
+        Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus(), userName);
         if (i > 0) {
             return success();
         } else {
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index f8d75ff..d0b4c11 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -56,7 +56,7 @@ public class OrderDetailDto {
     @ApiModelProperty(value = "日租金")
     private BigDecimal dayLeasePrice;
 
-    @ApiModelProperty(value = "订单状态（0未下单  1已下单  2待出库 3待收货  4租赁中  5已退租  6已完成）")
+    @ApiModelProperty(value = "订单状态（0未下单  1已下单  2待出库 3待收货  4租赁中  5已退租  6已完成  7已驳回）")
     private String orderStatus;
 
     @ApiModelProperty(value = "创建日期")
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
index 5f52467..b22663d 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
@@ -27,5 +27,5 @@ public interface OrderMapper {
 
     void updateMaStatus(OrderDetailDto orderDetailDto);
 
-    Integer updateOrderStatus(@Param("ids") List<Integer> ids, @Param("orderStatus") String orderStatus,@Param("userId") Long userId);
+    Integer updateOrderStatus(@Param("ids") List<Integer> ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 572a6ba..11f5f17 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -42,15 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateOrderStatus">
         update ma_order_details set order_status = #{orderStatus}
         <if test="orderStatus == 3">
-            ,pre_outbound_user = #{userId},
+            ,pre_outbound_user = #{userName},
             ,pre_outbound_time = now()
         </if>
         <if test="orderStatus == 4">
-            ,take_over_user = #{userId},
+            ,take_over_user = #{userName},
             ,take_over_time = now()
         </if>
         <if test="orderStatus == 5">
-            ,rent_over_user = #{userId},
+            ,rent_over_user = #{userName},
             ,rent_over_time = now()
         </if>
         where id in