From ce7bf2e6ff801146d2ee02825b23d186e110c523 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 22 Jul 2025 18:06:35 +0800
Subject: [PATCH] 骑手送达照片记录
---
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 caaee55..6b046a1 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,11 +5,13 @@
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.OrderDeliveryPhotosVo;
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;
import com.oying.utils.R;
+import com.oying.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -37,6 +39,8 @@
private final RiderInfoService riderInfoService;
private final RiderOrderRecordService riderOrderRecordService;
+
+ private final RiderDeliveryPhotosService riderDeliveryPhotosService;
@GetMapping("getRiderSourceInfo/{riderId}")
@@ -96,7 +100,7 @@
// @PreAuthorize("@el.check('riderOrderRecord:list')")
public ResponseEntity<?> riderGrabOrder(@PathVariable String orderNum) {
// 订单号不能为空
- if (orderNum == null || orderNum.equals("")) {
+ if (StringUtils.isBlank(orderNum)) {
return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
}
R result = riderOrderRecordService.riderGrabOrder(orderNum);
@@ -108,7 +112,7 @@
// @PreAuthorize("@el.check('riderOrderRecord:list')")
public ResponseEntity<?> riderCancelOrder(@PathVariable String orderNum) {
// 订单号不能为空
- if (orderNum == null || orderNum.equals("")) {
+ if (StringUtils.isBlank(orderNum)) {
return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
}
R result = riderOrderRecordService.riderCancelOrder(orderNum);
@@ -120,7 +124,7 @@
// @PreAuthorize("@el.check('riderOrderRecord:list')")
public ResponseEntity<?> riderCompleteOrder(@PathVariable String orderNum) {
// 订单号不能为空
- if (orderNum == null || orderNum.equals("")) {
+ if (StringUtils.isBlank(orderNum)) {
return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
}
R result = riderOrderRecordService.riderCompleteOrder(orderNum);
@@ -130,12 +134,24 @@
@PostMapping("riderOperationOrder")
@ApiOperation("骑手上报到店/取货配送")
// @PreAuthorize("@el.check('riderOrderRecord:list')")
- public ResponseEntity<?> riderOperationOrder(@RequestBody OrderRiderOperationVo orderRiderOperation) {
+ public ResponseEntity<?> riderOperationOrder(@RequestBody OrderRiderOperationVo orderRiderOperationVo) {
// 订单号不能为空
- if (orderRiderOperation.getOrderNum() == null || orderRiderOperation.getOrderNum().equals("")) {
+ if (StringUtils.isBlank(orderRiderOperationVo.getOrderNum())) {
return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
}
- R result = riderOrderRecordService.riderOperationOrder(orderRiderOperation);
+ R result = riderOrderRecordService.riderOperationOrder(orderRiderOperationVo);
+ return ResponseEntity.ok(R.success(result));
+ }
+
+ @PostMapping("riderDeliveryPhotos")
+ @ApiOperation("骑手上传图片记录")
+ // @PreAuthorize("@el.check('riderOrderRecord:list')")
+ public ResponseEntity<?> riderDeliveryPhotos(@RequestBody OrderDeliveryPhotosVo orderDeliveryPhotosVo) {
+ // 订单号不能为空
+ if (StringUtils.isBlank(orderDeliveryPhotosVo.getOrderNum())) {
+ return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
+ }
+ Boolean result = riderDeliveryPhotosService.riderDeliveryPhotos(orderDeliveryPhotosVo);
return ResponseEntity.ok(R.success(result));
}
--
Gitblit v1.9.3