From d4e094a4f19e5656baf02b87009417521a6d0857 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Tue, 5 Mar 2024 18:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B6=E8=B4=A7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cyl/h5/service/H5OrderService.java    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 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 893a57b..6eb95a2 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
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyl.h5.config.SecurityUtil;
 import com.cyl.h5.pojo.dto.ApplyRefundDTO;
 import com.cyl.h5.pojo.dto.OrderCreateDTO;
 import com.cyl.h5.pojo.dto.OrderProductListDTO;
@@ -372,11 +373,12 @@ public class H5OrderService {
             OrderItem queryOrderItem = new OrderItem();
             queryOrderItem.setOrderId(order.getId());
             //更新订单
-            UpdateWrapper<Order> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("id", order.getId());
-            updateWrapper.set("status", Constants.H5OrderStatus.COMPLETED);
-            updateWrapper.set("confirm_status", 1);
-            orderMapper.update(null, updateWrapper);
+            order.setStatus(Constants.H5OrderStatus.COMPLETED);
+            order.setReceiveTime(optDate);
+            order.setConfirmStatus(1);
+            order.setUpdateTime(optDate);
+            order.setUpdateBy(null);
+            orderMapper.updateById(order);
             //创建订单操作记录
             OrderOperateHistory optHistory = new OrderOperateHistory();
             optHistory.setOrderId(order.getId());
@@ -402,13 +404,12 @@ public class H5OrderService {
         if(!order.getStatus().equals(Constants.H5OrderStatus.DELIVERED)){
             throw new RuntimeException("订单状态已改变，请刷新");
         }
-        //更新订单
-        UpdateWrapper<Order> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", order.getId());
-        updateWrapper.set("status", Constants.H5OrderStatus.COMPLETED);
-        updateWrapper.set("confirm_status", 1);
-        updateWrapper.set("receive_time", optDate);
-        orderMapper.update(null, updateWrapper);
+        order.setStatus(Constants.H5OrderStatus.COMPLETED);
+        order.setReceiveTime(optDate);
+        order.setConfirmStatus(1);
+        order.setUpdateTime(optDate);
+        order.setUpdateBy(SecurityUtil.getLocalMember().getId());
+        orderMapper.updateById(order);
         //创建订单操作记录
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());