From dd5bb9e27d2ac0a879ccb62df985d51ac9562198 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 19:43:53 +0800
Subject: [PATCH] 骑手到店上报、已取商品

---
 oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 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 9def780..06ec841 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
@@ -5,6 +5,7 @@
 import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;
 import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
 import com.oying.modules.rider.domain.dto.RiderWithdrawalRecordQueryCriteria;
+import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;
 import com.oying.modules.rider.service.*;
 import com.oying.modules.rider.utils.Constants;
 import com.oying.utils.PageResult;
@@ -126,4 +127,28 @@
     //     return ResponseEntity.ok(R.success(result));
     // }
 
+    @GetMapping("riderOperationOrder")
+    @ApiOperation("骑手上报到店")
+    @PreAuthorize("@el.check('riderOrderRecord:list')")
+    public ResponseEntity<?> riderOperationOrder(OrderRiderOperationVo orderRiderOperation) {
+        // 订单号不能为空
+        if (orderRiderOperation.getOrderNum() == null || orderRiderOperation.getOrderNum().equals("")) {
+            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
+        }
+        R result = riderOrderRecordService.riderOperationOrder(orderRiderOperation);
+        return ResponseEntity.ok(R.success(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