From c99b2aad164da7ce15536b716854da9ae46780ae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 10:51:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 532aade..c1ede1b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -55,6 +55,17 @@
     }
 
     /**
+     * 订单列表-取消订单
+     * @param id
+     * @return
+     */
+    @GetMapping("cancelOrder/{id}")
+    @ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败")
+    public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallOrderService.cancelOrder(id);
+    }
+
+    /**
      * 订单退款-列表
      * @param mallOrderRefundDto
      * @param request

--
Gitblit v1.9.1