From 46f7c2ef3abc235e44c59be9b3c5396befc64888 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:33:09 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 5547a24..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,7 +24,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "骑手订单信息")
+@Api(tags = "骑手：骑手订单信息")
@RequestMapping("/api/rider/riderOrderRecord")
public class RiderOrderRecordController {
@@ -39,9 +40,9 @@
@GetMapping
@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
@@ -50,7 +51,7 @@
@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
@@ -59,7 +60,7 @@
@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
@@ -68,6 +69,6 @@
@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