From 35cc96f68c3a33288351baba158feb9fec94a5d1 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 10:40:04 +0800
Subject: [PATCH] 骑手到店上报、已取商品
---
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 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 06ec841..c7ba1d3 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
@@ -115,17 +115,17 @@
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));
- // }
+ @GetMapping("riderCompleteOrder/{orderNum}")
+ @ApiOperation("骑手订单已送达")
+ @PreAuthorize("@el.check('riderOrderRecord:list')")
+ public ResponseEntity<?> riderCompleteOrder(@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));
+ }
@GetMapping("riderOperationOrder")
@ApiOperation("骑手上报到店")
@@ -138,17 +138,5 @@
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