From 21243336236f8ac0575885eaedd43a6b8eeca31b Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:44:18 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 89a1ecc..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
@@ -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;
@@ -41,7 +42,7 @@
@GetMapping("getRiderSourceInfo/{riderId}")
@ApiOperation("查询第三方数据骑手信息")
@PreAuthorize("@el.check('riderInfo:list')")
- public ResponseEntity<?> getRiderSourceInfo(@PathVariable String riderId) {
+ public ResponseEntity<?> getRiderSourceInfo(@PathVariable Long riderId) {
RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
return ResponseEntity.ok(R.success(riderInfo));
}
@@ -114,4 +115,28 @@
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("骑手上报到店")
+ @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));
+ }
+
}
--
Gitblit v1.9.3