骑手接口返回值修改

彭雪彬

2025-07-09 9ecbddaf1d8a3659f7ea30c0a22d8352d92ce1c8

骑手接口返回值修改

 oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java

@@ -4,26 +4,31 @@
import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;
import com.oying.modules.rider.service.RiderIncomeDetailService;
import com.oying.modules.rider.domain.RiderIncomeDetail;
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;

import java.io.IOException;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.utils.PageResult;

/**
* @author pxb
* @date 2025-06-18
**/
 * @author pxb
 * @date 2025-06-18
 **/
@RestController
@RequiredArgsConstructor
@Api(tags = "骑手收入明细")
@Api(tags = "骑手：骑手收入明细")
@RequestMapping("/api/rider/riderIncomeDetail")
public class RiderIncomeDetailController {

@@ -39,27 +44,27 @@
    @GetMapping
    @ApiOperation("查询骑手收入明细")
    @PreAuthorize("@el.check('riderIncomeDetail:list')")
    public ResponseEntity<PageResult<RiderIncomeDetail>> queryRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria){
    public ResponseEntity<Object> queryRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(riderIncomeDetailService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(riderIncomeDetailService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @PostMapping
    @Log("新增骑手收入明细")
    @ApiOperation("新增骑手收入明细")
    @PreAuthorize("@el.check('riderIncomeDetail:add')")
    public ResponseEntity<Object> createRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources){
    public ResponseEntity<Object> createRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources) {
        riderIncomeDetailService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PutMapping
    @Log("修改骑手收入明细")
    @ApiOperation("修改骑手收入明细")
    @PreAuthorize("@el.check('riderIncomeDetail:edit')")
    public ResponseEntity<Object> updateRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources){
    public ResponseEntity<Object> updateRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources) {
        riderIncomeDetailService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,6 +73,6 @@
    @PreAuthorize("@el.check('riderIncomeDetail:del')")
    public ResponseEntity<Object> deleteRiderIncomeDetail(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        riderIncomeDetailService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}

 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,7 +24,7 @@
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "三方骑手数据信息")
@Api(tags = "骑手：三方骑手数据信息")
@RequestMapping("/api/rider/riderInfo")
public class RiderInfoController {

@@ -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);
    }
}

 oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderOperationController.java

@@ -4,26 +4,31 @@
import com.oying.modules.rider.domain.RiderOrderOperation;
import com.oying.modules.rider.service.RiderOrderOperationService;
import com.oying.modules.rider.domain.dto.RiderOrderOperationQueryCriteria;
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;

import java.io.IOException;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.utils.PageResult;

/**
* @author pxb
* @date 2025-06-18
**/
 * @author pxb
 * @date 2025-06-18
 **/
@RestController
@RequiredArgsConstructor
@Api(tags = "骑手订单操作日志")
@Api(tags = "骑手：骑手订单操作日志")
@RequestMapping("/api/rider/riderOrderOperation")
public class RiderOrderOperationController {

@@ -39,27 +44,27 @@
    @GetMapping
    @ApiOperation("查询骑手订单操作日志")
    @PreAuthorize("@el.check('riderOrderOperation:list')")
    public ResponseEntity<PageResult<RiderOrderOperation>> queryRiderOrderOperation(RiderOrderOperationQueryCriteria criteria){
    public ResponseEntity<Object> queryRiderOrderOperation(RiderOrderOperationQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(riderOrderOperationService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(riderOrderOperationService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @PostMapping
    @Log("新增骑手订单操作日志")
    @ApiOperation("新增骑手订单操作日志")
    @PreAuthorize("@el.check('riderOrderOperation:add')")
    public ResponseEntity<Object> createRiderOrderOperation(@Validated @RequestBody RiderOrderOperation resources){
    public ResponseEntity<Object> createRiderOrderOperation(@Validated @RequestBody RiderOrderOperation resources) {
        riderOrderOperationService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PutMapping
    @Log("修改骑手订单操作日志")
    @ApiOperation("修改骑手订单操作日志")
    @PreAuthorize("@el.check('riderOrderOperation:edit')")
    public ResponseEntity<Object> updateRiderOrderOperation(@Validated @RequestBody RiderOrderOperation resources){
    public ResponseEntity<Object> updateRiderOrderOperation(@Validated @RequestBody RiderOrderOperation resources) {
        riderOrderOperationService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,6 +73,6 @@
    @PreAuthorize("@el.check('riderOrderOperation:del')")
    public ResponseEntity<Object> deleteRiderOrderOperation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        riderOrderOperationService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}

 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);
    }
}

 oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderReminderController.java

@@ -4,6 +4,7 @@
import com.oying.modules.rider.domain.RiderOrderReminder;
import com.oying.modules.rider.service.RiderOrderReminderService;
import com.oying.modules.rider.domain.dto.RiderOrderReminderQueryCriteria;
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/riderOrderReminder")
public class RiderOrderReminderController {

@@ -39,9 +40,9 @@
    @GetMapping
    @ApiOperation("查询骑手消息提示记录")
    @PreAuthorize("@el.check('riderOrderReminder:list')")
    public ResponseEntity<PageResult<RiderOrderReminder>> queryRiderOrderReminder(RiderOrderReminderQueryCriteria criteria){
    public ResponseEntity<Object> queryRiderOrderReminder(RiderOrderReminderQueryCriteria criteria){
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(riderOrderReminderService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(riderOrderReminderService.queryAll(criteria,page)),HttpStatus.OK);
    }

    @PostMapping
@@ -50,7 +51,7 @@
    @PreAuthorize("@el.check('riderOrderReminder:add')")
    public ResponseEntity<Object> createRiderOrderReminder(@Validated @RequestBody RiderOrderReminder resources){
        riderOrderReminderService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
    }

    @PutMapping
@@ -59,7 +60,7 @@
    @PreAuthorize("@el.check('riderOrderReminder:edit')")
    public ResponseEntity<Object> updateRiderOrderReminder(@Validated @RequestBody RiderOrderReminder resources){
        riderOrderReminderService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,6 +69,6 @@
    @PreAuthorize("@el.check('riderOrderReminder:del')")
    public ResponseEntity<Object> deleteRiderOrderReminder(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        riderOrderReminderService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(),HttpStatus.OK);
    }
}

 oying-system/src/main/java/com/oying/modules/rider/rest/RiderWalletInfoController.java

@@ -4,6 +4,7 @@
import com.oying.modules.rider.domain.RiderWalletInfo;
import com.oying.modules.rider.service.RiderWalletInfoService;
import com.oying.modules.rider.domain.dto.RiderWalletInfoQueryCriteria;
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/riderWalletInfo")
public class RiderWalletInfoController {

@@ -39,9 +40,9 @@
    @GetMapping
    @ApiOperation("查询骑手钱包详情")
    @PreAuthorize("@el.check('riderWalletInfo:list')")
    public ResponseEntity<PageResult<RiderWalletInfo>> queryRiderWalletInfo(RiderWalletInfoQueryCriteria criteria){
    public ResponseEntity<Object> queryRiderWalletInfo(RiderWalletInfoQueryCriteria criteria){
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(riderWalletInfoService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(riderWalletInfoService.queryAll(criteria,page)),HttpStatus.OK);
    }

    @PostMapping
@@ -50,7 +51,7 @@
    @PreAuthorize("@el.check('riderWalletInfo:add')")
    public ResponseEntity<Object> createRiderWalletInfo(@Validated @RequestBody RiderWalletInfo resources){
        riderWalletInfoService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
    }

    @PutMapping
@@ -59,7 +60,7 @@
    @PreAuthorize("@el.check('riderWalletInfo:edit')")
    public ResponseEntity<Object> updateRiderWalletInfo(@Validated @RequestBody RiderWalletInfo resources){
        riderWalletInfoService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,7 +69,7 @@
    @PreAuthorize("@el.check('riderWalletInfo:del')")
    public ResponseEntity<Object> deleteRiderWalletInfo(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        riderWalletInfoService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(),HttpStatus.OK);
    }

}

 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);
    }
}

 oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java

@@ -22,7 +22,7 @@
 **/
@RestController
@RequiredArgsConstructor
@Api(tags = "骑手微信小程序接口")
@Api(tags = "骑手小程序：骑手微信小程序接口")
@RequestMapping("/api/wx/rider")
public class WxRiderController {