From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..634f27a 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
@@ -114,12 +114,12 @@
return ApiResponse.success(null);
}
- @ApiOperation("纭椤惧鍒板簵")
- @PostMapping("/confirmArrived")
+ @ApiOperation("鎵嬪姩瑙﹀彂璁㈠崟缁撶畻")
+ @PostMapping("/settle")
@RequiresPermissions("business:orders:update")
- public ApiResponse confirmArrived(@RequestBody ConfirmArriveDTO dto) {
- ordersService.confirmCustomerArrived(dto.getOrderId(), dto.getShopId());
- return ApiResponse.success(null);
+ public ApiResponse settleOrders() {
+ ordersService.settleOrders();
+ return ApiResponse.success("缁撶畻瀹屾垚");
}
}
--
Gitblit v1.9.3