From eb77373d92f01e51b98bda8fae66315ed9a4394d Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 17:08:57 +0800
Subject: [PATCH] 骑手接单和骑手取消订单

---
 oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
index 2adcfa4..89a1ecc 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
@@ -6,6 +6,7 @@
 import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
 import com.oying.modules.rider.domain.dto.RiderWithdrawalRecordQueryCriteria;
 import com.oying.modules.rider.service.*;
+import com.oying.modules.rider.utils.Constants;
 import com.oying.utils.PageResult;
 import com.oying.utils.R;
 import io.swagger.annotations.Api;
@@ -88,4 +89,29 @@
         return ResponseEntity.ok(R.success(riderOrderRecordPageResult));
     }
 
+
+    @GetMapping("riderGrabOrder/{orderNum}")
+    @ApiOperation("骑手接单")
+    @PreAuthorize("@el.check('riderOrderRecord:list')")
+    public ResponseEntity<?> riderGrabOrder(@PathVariable String orderNum) {
+        // 订单号不能为空
+        if (orderNum == null || orderNum.equals("")) {
+            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
+        }
+        R result = riderOrderRecordService.riderGrabOrder(orderNum);
+        return ResponseEntity.ok(result);
+    }
+
+    @GetMapping("riderCancelOrder/{orderNum}")
+    @ApiOperation("骑手取消接单")
+    @PreAuthorize("@el.check('riderOrderRecord:list')")
+    public ResponseEntity<?> riderCancelOrder(@PathVariable String orderNum) {
+        // 订单号不能为空
+        if (orderNum == null || orderNum.equals("")) {
+            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
+        }
+        R result = riderOrderRecordService.riderCancelOrder(orderNum);
+        return ResponseEntity.ok(R.success(result));
+    }
+
 }

--
Gitblit v1.9.3