From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/admin/src/main/java/com/doumee/api/business/OrdersController.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
index 5a7f66b..fa16c18 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
@@ -122,4 +122,12 @@
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鎵嬪姩瑙﹀彂璁㈠崟缁撶畻")
+    @PostMapping("/settle")
+    @RequiresPermissions("business:orders:update")
+    public ApiResponse settleOrders() {
+        ordersService.settleOrders();
+        return ApiResponse.success("缁撶畻瀹屾垚");
+    }
+
 }

--
Gitblit v1.9.3