From 99b600d34ee5e2d82eecc4df233c33ecd0e18841 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 19 七月 2025 16:14:20 +0800
Subject: [PATCH] 111

---
 server/web/src/main/java/com/doumee/api/web/OrdersApi.java |   45 ++++++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 27 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 fe942c1..3bfc6c4 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
@@ -62,9 +62,22 @@
     })
     public ApiResponse updateOrder(@RequestBody Orders orders) {
         orders.setMember(this.getMemberResponse());
-        ordersService.updateById(orders);
+        ordersService.update(orders);
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
+
+
+//    @LoginRequired
+//    @ApiOperation(value = "淇敼璁㈠崟鏃ユ湡 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+//    @PostMapping("/updOrderData")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//    })
+//    public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
+//        updOrderDataDTO.setMember(this.getMemberResponse());
+//        ordersService.updOrderData(updOrderDataDTO);
+//        return  ApiResponse.success("鎿嶄綔鎴愬姛");
+//    }
 
     @LoginRequired
     @ApiOperation(value = "鎵嬪姩鎺ュ崟 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
@@ -90,39 +103,17 @@
 
     @LoginRequired
     @ApiOperation(value = "鍙栨秷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
-    @GetMapping("/releaseCancelOrder")
+    @GetMapping("/cancelOrder")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
-    public ApiResponse releaseCancelOrder(@RequestParam Integer orderId) {
-        ordersService.releaseCancelOrder(orderId,this.getMemberResponse());
+    public ApiResponse cancelOrder(@RequestParam Integer orderId) {
+        ordersService.cancelOrder(orderId,this.getMemberResponse());
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
 
-    @LoginRequired
-    @ApiOperation(value = "鍙栨秷鎺ュ崟 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
-    @GetMapping("/receiveCancelOrder")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse receiveCancelOrder(@RequestParam Integer orderId) {
-        ordersService.receiveCancelOrder(orderId,this.getMemberResponse());
-        return  ApiResponse.success("鎿嶄綔鎴愬姛");
-    }
 
-
-    @LoginRequired
-    @ApiOperation(value = "淇敼璁㈠崟鏃ユ湡 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
-    @PostMapping("/updOrderData")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
-        updOrderDataDTO.setMember(this.getMemberResponse());
-        ordersService.updOrderData(updOrderDataDTO);
-        return  ApiResponse.success("鎿嶄綔鎴愬姛");
-    }
 
     @LoginRequired
     @ApiOperation(value = "纭璁㈠崟淇敼 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
@@ -191,7 +182,7 @@
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
     public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
-        return  ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
+        return  ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse()));
     }
 
     @LoginRequired

--
Gitblit v1.9.3