From a9b45a90035d1af1cec90d40e89e95c87f3d0b48 Mon Sep 17 00:00:00 2001
From: riverflow <3011499946@qq.com>
Date: Thu, 21 Aug 2025 21:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/UserOrderController.java | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java
index d3fe25e..7f4cf19 100644
--- a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java
+++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java
@@ -1,5 +1,6 @@
 package com.itmk.web.order.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.itmk.utils.ResultUtils;
@@ -42,6 +43,13 @@ public class UserOrderController {
     //发货
     @PutMapping("/sendOrder")
     public ResultVo sendOrder(@RequestBody SendParm parm){
+        //判断订单是否被取消
+        QueryWrapper<UserOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(UserOrder::getOrderId,parm.getOrderId()).eq(UserOrder::getStatus,"3");
+        UserOrder one = userOrderService.getOne(queryWrapper);
+        if(one != null){
+            return ResultUtils.error("订单已被取消，不能发货!");
+        }
         //更新条件
         LambdaUpdateWrapper<UserOrder> query = new LambdaUpdateWrapper<>();
         query.eq(UserOrder::getOrderId,parm.getOrderId())
@@ -51,4 +59,24 @@ public class UserOrderController {
         }
         return ResultUtils.error("更新失败!");
     }
+
+    //取消订单
+    @PostMapping("/cancelOrder")
+    public ResultVo cancelOrder(@RequestBody SendParm parm){
+        //如果已发货，不能取消
+        QueryWrapper<UserOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(UserOrder::getOrderId,parm.getOrderId()).eq(UserOrder::getStatus,"1");
+        UserOrder one = userOrderService.getOne(queryWrapper);
+        if(one != null){
+            return ResultUtils.error("订单已发货，不能取消!");
+        }
+        //更新条件
+        LambdaUpdateWrapper<UserOrder> query = new LambdaUpdateWrapper<>();
+        query.eq(UserOrder::getOrderId,parm.getOrderId())
+                .set(UserOrder::getStatus,"3");
+        if(userOrderService.update(query)){
+            return ResultUtils.success("取消成功!");
+        }
+        return ResultUtils.error("取消失败!");
+    }
 }