From d0e3ffb8fd33304271797538c33c9bb9be914cd6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 11:08:58 +0800
Subject: [PATCH] 1.管理后台商品分类

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index f896d40..3a63281 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -10,6 +10,7 @@
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.enums.OrderStatus;
 import com.ruoyi.order.model.Order;
 import com.ruoyi.order.service.OrderService;
 import com.ruoyi.order.vo.OrderDetailVO;
@@ -112,7 +113,9 @@
     })
     @GetMapping("/cancel/{orderId}")
     public R<Void> cancel(@PathVariable("orderId") Long orderId){
-        // TODO 待完善
+        orderService.update(new LambdaUpdateWrapper<Order>()
+                .eq(Order::getId, orderId)
+                .set(Order::getOrderStatus, OrderStatus.CANCELLED.getCode()));
         return R.ok();
     }
 
@@ -125,7 +128,9 @@
     })
     @GetMapping("/confirm/{orderId}")
     public R<Void> confirm(@PathVariable("orderId") Long orderId){
-        // TODO 待完善
+        Order order = orderService.getById(orderId);
+        order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+        orderService.updateById(order);
         return R.ok();
     }
 

--
Gitblit v1.7.1