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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 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 54d4698..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
@@ -6,6 +6,11 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.ConfirmArriveDTO;
+import com.doumee.dao.dto.DispatchDTO;
+import com.doumee.dao.vo.OrderDetailVO;
+import com.doumee.dao.vo.OrderDispatchVO;
+import com.doumee.dao.vo.OrderSummaryVO;
import com.doumee.service.business.OrdersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -66,6 +71,13 @@
return ApiResponse.success(ordersService.findPage(pageWrap));
}
+ @ApiOperation("璁㈠崟姹囨�荤粺璁�")
+ @PostMapping("/summary")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderSummaryVO> findSummary(@RequestBody PageWrap<Orders> pageWrap) {
+ return ApiResponse.success(ordersService.findSummary(pageWrap));
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:orders:exportExcel")
@@ -80,4 +92,42 @@
return ApiResponse.success(ordersService.findById(id));
}
+ @ApiOperation("璁㈠崟璇︽儏")
+ @GetMapping("/detail/{id}")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderDetailVO> findDetail(@PathVariable Integer id) {
+ return ApiResponse.success(ordersService.findDetail(id));
+ }
+
+ @ApiOperation("鎵嬪姩娲惧崟淇℃伅")
+ @GetMapping("/dispatch/{id}")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderDispatchVO> findDispatchInfo(@PathVariable Integer id) {
+ return ApiResponse.success(ordersService.findDispatchInfo(id));
+ }
+
+ @ApiOperation("璁㈠崟娲惧崟")
+ @PostMapping("/dispatch")
+ @RequiresPermissions("business:orders:update")
+ public ApiResponse dispatch(@RequestBody DispatchDTO dto) {
+ ordersService.dispatch(dto);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("纭椤惧鍒板簵")
+ @PostMapping("/confirmArrived")
+ @RequiresPermissions("business:orders:update")
+ public ApiResponse confirmArrived(@RequestBody ConfirmArriveDTO dto) {
+ ordersService.confirmCustomerArrived(dto.getOrderId(), dto.getShopId());
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵嬪姩瑙﹀彂璁㈠崟缁撶畻")
+ @PostMapping("/settle")
+ @RequiresPermissions("business:orders:update")
+ public ApiResponse settleOrders() {
+ ordersService.settleOrders();
+ return ApiResponse.success("缁撶畻瀹屾垚");
+ }
+
}
--
Gitblit v1.9.3