blame | history | patch | commit | commitdiff | ignore whitespace
彭雪彬
2025-09-04 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 
 oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java


@@ -1,21 +1,28 @@


package com.oying.modules.rider.rest;




import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.oying.domain.BucketStorage;


import com.oying.exception.BadRequestException;


import com.oying.modules.rider.domain.*;


import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;


import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;


import com.oying.modules.rider.domain.dto.RiderWithdrawalRecordQueryCriteria;


import com.oying.modules.rider.domain.vo.OrderDeliveryPhotosVo;


import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;


import com.oying.modules.rider.service.*;


import com.oying.modules.rider.utils.Constants;


import com.oying.service.BucketStorageService;


import com.oying.utils.FileUtil;


import com.oying.utils.PageResult;


import com.oying.utils.R;


import com.oying.utils.StringUtils;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.RequiredArgsConstructor;


import org.springframework.http.ResponseEntity;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;






/**


@@ -38,10 +45,12 @@




    private final RiderOrderRecordService riderOrderRecordService;




    private final RiderDeliveryPhotosService riderDeliveryPhotosService;






    @GetMapping("getRiderSourceInfo/{riderId}")


    @ApiOperation("查询第三方数据骑手信息")


    @PreAuthorize("@el.check('riderInfo:list')")


    // @PreAuthorize("@el.check('riderInfo:list')")


    public ResponseEntity<?> getRiderSourceInfo(@PathVariable Long riderId) {


        RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);


        return ResponseEntity.ok(R.success(riderInfo));


@@ -49,15 +58,15 @@




    @GetMapping("syncRiderSourceInfo/{sourcePlatform}")


    @ApiOperation("同步查询第三方骑手信息 LY")


    @PreAuthorize("@el.check('riderInfo:edit')")


    // @PreAuthorize("@el.check('riderInfo:edit')")


    public ResponseEntity<?> syncRiderSourceInfo(@PathVariable String sourcePlatform) {


        riderInfoService.syncRiderSourceInfo(sourcePlatform);


        return ResponseEntity.ok(R.success());


        return ResponseEntity.ok(R.success("操作成功"));


    }




    @GetMapping("getRiderWalletInfo/{riderId}")


    @ApiOperation("查询骑手钱包信息")


    @PreAuthorize("@el.check('riderWalletInfo:list')")


    // @PreAuthorize("@el.check('riderWalletInfo:list')")


    public ResponseEntity<?> getRiderWalletInfo(@PathVariable String riderId) {


        RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(riderId);


        return ResponseEntity.ok(R.success(riderWalletInfo));


@@ -65,7 +74,7 @@




    @GetMapping("getRiderIncomeDetail")


    @ApiOperation("查询骑手订单收入明细分页")


    @PreAuthorize("@el.check('riderIncomeDetail:list')")


    // @PreAuthorize("@el.check('riderIncomeDetail:list')")


    public ResponseEntity<?> getRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria) {


        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());


        PageResult<RiderIncomeDetail> riderIncomeDetails = riderIncomeDetailService.queryAll(criteria, page);


@@ -74,7 +83,7 @@




    @GetMapping("getRiderWithdrawalRecord")


    @ApiOperation("查询骑手提现记录分页")


    @PreAuthorize("@el.check('riderWithdrawalRecord:list')")


    // @PreAuthorize("@el.check('riderWithdrawalRecord:list')")


    public ResponseEntity<?> getRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria) {


        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());


        PageResult<RiderWithdrawalRecord> riderIncomeDetails = riderWithdrawalRecordService.queryAll(criteria, page);


@@ -83,7 +92,7 @@




    @GetMapping("getRiderOrderRecord")


    @ApiOperation("查询骑手订单记录分页")


    @PreAuthorize("@el.check('riderOrderRecord:list')")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> getRiderOrderRecord(RiderOrderRecordQueryCriteria criteria) {


        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());


        PageResult<RiderOrderRecord> riderOrderRecordPageResult = riderOrderRecordService.queryAll(criteria, page);


@@ -93,11 +102,11 @@




    @GetMapping("riderGrabOrder/{orderNum}")


    @ApiOperation("骑手接单")


    @PreAuthorize("@el.check('riderOrderRecord:list')")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderGrabOrder(@PathVariable String orderNum) {


        // 订单号不能为空


        if (orderNum == null || orderNum.equals("")) {


            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));


        if (StringUtils.isBlank(orderNum)) {


            throw new BadRequestException("订单号不能为空");


        }


        R result = riderOrderRecordService.riderGrabOrder(orderNum);


        return ResponseEntity.ok(result);


@@ -105,11 +114,11 @@




    @GetMapping("riderCancelOrder/{orderNum}")


    @ApiOperation("骑手取消接单")


    @PreAuthorize("@el.check('riderOrderRecord:list')")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderCancelOrder(@PathVariable String orderNum) {


        // 订单号不能为空


        if (orderNum == null || orderNum.equals("")) {


            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));


        if (StringUtils.isBlank(orderNum)) {


            throw new BadRequestException("订单号不能为空");


        }


        R result = riderOrderRecordService.riderCancelOrder(orderNum);


        return ResponseEntity.ok(R.success(result));


@@ -117,25 +126,37 @@




    @GetMapping("riderCompleteOrder/{orderNum}")


    @ApiOperation("骑手订单已送达")


    @PreAuthorize("@el.check('riderOrderRecord:list')")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderCompleteOrder(@PathVariable String orderNum) {


        // 订单号不能为空


        if (orderNum == null || orderNum.equals("")) {


            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));


        if (StringUtils.isBlank(orderNum)) {


            throw new BadRequestException("订单号不能为空");


        }


        R result = riderOrderRecordService.riderCancelOrder(orderNum);


        R result = riderOrderRecordService.riderCompleteOrder(orderNum);


        return ResponseEntity.ok(R.success(result));


    }




    @GetMapping("riderOperationOrder")


    @ApiOperation("骑手上报到店")


    @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderOperationOrder(OrderRiderOperationVo orderRiderOperation) {


    @PostMapping("riderOperationOrder")


    @ApiOperation("骑手上报到店/取货配送")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderOperationOrder(@RequestBody OrderRiderOperationVo orderRiderOperationVo) {


        // 订单号不能为空


        if (orderRiderOperation.getOrderNum() == null || orderRiderOperation.getOrderNum().equals("")) {


            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));


        if (StringUtils.isBlank(orderRiderOperationVo.getOrderNum())) {


            throw new BadRequestException("订单号不能为空");


        }


        R result = riderOrderRecordService.riderOperationOrder(orderRiderOperation);


        R result = riderOrderRecordService.riderOperationOrder(orderRiderOperationVo);


        return ResponseEntity.ok(R.success(result));


    }




    @PostMapping("riderDeliveryPhotos")


    @ApiOperation("骑手上传图片")


    // @PreAuthorize("@el.check('riderOrderRecord:list')")


    public ResponseEntity<?> riderDeliveryPhotos(OrderDeliveryPhotosVo orderDeliveryPhotosVo) {


        // 订单号不能为空


        if (StringUtils.isBlank(orderDeliveryPhotosVo.getOrderNum())) {


            throw new BadRequestException("订单号不能为空");


        }


        RiderDeliveryPhotos result = riderDeliveryPhotosService.riderDeliveryPhotos(orderDeliveryPhotosVo);


        return ResponseEntity.ok(R.success(result));


    }