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/RiderInfoController.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderInfoController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderInfoController.java index eeb677e..3931957 100644 --- a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderInfoController.java +++ b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderInfoController.java @@ -4,6 +4,7 @@ import com.oying.modules.rider.domain.RiderInfo; import com.oying.modules.rider.service.RiderInfoService; import com.oying.modules.rider.domain.dto.RiderInfoQueryCriteria; +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/riderInfo") +@Api(tags = "骑手:三方骑手数据信息") +@RequestMapping("/api/rider/riderInfo") public class RiderInfoController { private final RiderInfoService riderInfoService; @@ -39,9 +40,9 @@ @GetMapping @ApiOperation("查询三方骑手数据信息") @PreAuthorize("@el.check('riderInfo:list')") - public ResponseEntity<PageResult<RiderInfo>> queryRiderInfo(RiderInfoQueryCriteria criteria){ + public ResponseEntity<Object> queryRiderInfo(RiderInfoQueryCriteria criteria){ Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(riderInfoService.queryAll(criteria,page),HttpStatus.OK); + return new ResponseEntity<>(R.success(riderInfoService.queryAll(criteria,page)),HttpStatus.OK); } @PostMapping @@ -50,7 +51,7 @@ @PreAuthorize("@el.check('riderInfo:add')") public ResponseEntity<Object> createRiderInfo(@Validated @RequestBody RiderInfo resources){ riderInfoService.create(resources); - return new ResponseEntity<>(HttpStatus.CREATED); + return new ResponseEntity<>(R.success(),HttpStatus.CREATED); } @PutMapping @@ -59,7 +60,7 @@ @PreAuthorize("@el.check('riderInfo:edit')") public ResponseEntity<Object> updateRiderInfo(@Validated @RequestBody RiderInfo resources){ riderInfoService.update(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); + return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT); } @DeleteMapping @@ -68,6 +69,6 @@ @PreAuthorize("@el.check('riderInfo:del')") public ResponseEntity<Object> deleteRiderInfo(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) { riderInfoService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(R.success(),HttpStatus.OK); } } -- Gitblit v1.9.3