From d54dc04ae25b73ee0c7c588c6523d94624f052e3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 六月 2026 10:09:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index 48ad2ea..69e89ab 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -2,6 +2,7 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.LoginShopRequired;
+import com.doumee.core.annotation.LoginDriverRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
@@ -216,5 +217,34 @@
return ApiResponse.success("纭鏀惰揣鎴愬姛");
}
+ @LoginRequired
+ @ApiOperation(value = "浼氬憳鏌ヨ璁㈠崟鏃堕棿杞�")
+ @GetMapping("/timeline/{orderId}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse timelineForMember(@PathVariable Integer orderId) {
+ return ApiResponse.success(ordersService.getOrderTimeline(orderId));
+ }
+
+ @LoginShopRequired
+ @ApiOperation(value = "闂ㄥ簵鏌ヨ璁㈠崟鏃堕棿杞�")
+ @GetMapping("/shop/timeline/{orderId}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse timelineForShop(@PathVariable Integer orderId) {
+ return ApiResponse.success(ordersService.getOrderTimeline(orderId));
+ }
+
+ @LoginDriverRequired
+ @ApiOperation(value = "鍙告満鏌ヨ璁㈠崟鏃堕棿杞�")
+ @GetMapping("/driver/timeline/{orderId}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse timelineForDriver(@PathVariable Integer orderId) {
+ return ApiResponse.success(ordersService.getOrderTimeline(orderId));
+ }
}
--
Gitblit v1.9.3