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/RiderWithdrawalRecordController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderWithdrawalRecordController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderWithdrawalRecordController.java
index 849d729..3e08c9a 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderWithdrawalRecordController.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderWithdrawalRecordController.java
@@ -4,6 +4,7 @@
 import com.oying.modules.rider.domain.RiderWithdrawalRecord;
 import com.oying.modules.rider.service.RiderWithdrawalRecordService;
 import com.oying.modules.rider.domain.dto.RiderWithdrawalRecordQueryCriteria;
+import com.oying.utils.R;
 import lombok.RequiredArgsConstructor;
 import java.util.List;
 import org.springframework.http.HttpStatus;
@@ -23,7 +24,7 @@
 **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "骑手提现记录")
+@Api(tags = "骑手:骑手提现记录")
 @RequestMapping("/api/rider/riderWithdrawalRecord")
 public class RiderWithdrawalRecordController {
 
@@ -39,9 +40,9 @@
     @GetMapping
     @ApiOperation("查询骑手提现记录")
     @PreAuthorize("@el.check('riderWithdrawalRecord:list')")
-    public ResponseEntity<PageResult<RiderWithdrawalRecord>> queryRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria){
+    public ResponseEntity<Object> queryRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria){
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-        return new ResponseEntity<>(riderWithdrawalRecordService.queryAll(criteria,page),HttpStatus.OK);
+        return new ResponseEntity<>(R.success(riderWithdrawalRecordService.queryAll(criteria,page)),HttpStatus.OK);
     }
 
     @PostMapping
@@ -50,7 +51,7 @@
     @PreAuthorize("@el.check('riderWithdrawalRecord:add')")
     public ResponseEntity<Object> createRiderWithdrawalRecord(@Validated @RequestBody RiderWithdrawalRecord resources){
         riderWithdrawalRecordService.create(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
     }
 
     @PutMapping
@@ -59,7 +60,7 @@
     @PreAuthorize("@el.check('riderWithdrawalRecord:edit')")
     public ResponseEntity<Object> updateRiderWithdrawalRecord(@Validated @RequestBody RiderWithdrawalRecord resources){
         riderWithdrawalRecordService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
     }
 
     @DeleteMapping
@@ -68,6 +69,6 @@
     @PreAuthorize("@el.check('riderWithdrawalRecord:del')")
     public ResponseEntity<Object> deleteRiderWithdrawalRecord(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
         riderWithdrawalRecordService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(R.success(),HttpStatus.OK);
     }
 }

--
Gitblit v1.9.3