From 205ecdcba56836a14fdd83b41c65869900c936eb Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 18:23:05 +0800
Subject: [PATCH] 骑手接单

---
 oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java
index c2fa1aa..5fa67e1 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java
@@ -4,6 +4,7 @@
 import com.oying.modules.rider.domain.RiderOrderRecord;
 import com.oying.modules.rider.service.RiderOrderRecordService;
 import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
+import com.oying.utils.R;
 import lombok.RequiredArgsConstructor;
 import java.util.List;
 import org.springframework.http.HttpStatus;
@@ -23,8 +24,8 @@
 **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "骑手收入明细")
-@RequestMapping("/api/riderOrderRecord")
+@Api(tags = "骑手:骑手订单信息")
+@RequestMapping("/api/rider/riderOrderRecord")
 public class RiderOrderRecordController {
 
     private final RiderOrderRecordService riderOrderRecordService;
@@ -37,37 +38,37 @@
     }
 
     @GetMapping
-    @ApiOperation("查询骑手收入明细")
+    @ApiOperation("查询骑手订单信息")
     @PreAuthorize("@el.check('riderOrderRecord:list')")
-    public ResponseEntity<PageResult<RiderOrderRecord>> queryRiderOrderRecord(RiderOrderRecordQueryCriteria criteria){
+    public ResponseEntity<Object> queryRiderOrderRecord(RiderOrderRecordQueryCriteria criteria){
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-        return new ResponseEntity<>(riderOrderRecordService.queryAll(criteria,page),HttpStatus.OK);
+        return new ResponseEntity<>(R.success(riderOrderRecordService.queryAll(criteria,page)),HttpStatus.OK);
     }
 
     @PostMapping
-    @Log("新增骑手收入明细")
-    @ApiOperation("新增骑手收入明细")
+    @Log("新增骑手订单信息")
+    @ApiOperation("新增骑手订单信息")
     @PreAuthorize("@el.check('riderOrderRecord:add')")
     public ResponseEntity<Object> createRiderOrderRecord(@Validated @RequestBody RiderOrderRecord resources){
         riderOrderRecordService.create(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
     }
 
     @PutMapping
-    @Log("修改骑手收入明细")
-    @ApiOperation("修改骑手收入明细")
+    @Log("新增骑手订单信息")
+    @ApiOperation("新增骑手订单信息")
     @PreAuthorize("@el.check('riderOrderRecord:edit')")
     public ResponseEntity<Object> updateRiderOrderRecord(@Validated @RequestBody RiderOrderRecord resources){
         riderOrderRecordService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
     }
 
     @DeleteMapping
-    @Log("删除骑手收入明细")
-    @ApiOperation("删除骑手收入明细")
+    @Log("新增骑手订单信息")
+    @ApiOperation("新增骑手订单信息")
     @PreAuthorize("@el.check('riderOrderRecord:del')")
     public ResponseEntity<Object> deleteRiderOrderRecord(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
         riderOrderRecordService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(R.success(),HttpStatus.OK);
     }
 }

--
Gitblit v1.9.3