骑手到店上报、已取商品

彭雪彬

2025-07-15 35cc96f68c3a33288351baba158feb9fec94a5d1

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

@@ -5,6 +5,7 @@
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.OrderRiderOperationVo;
import com.oying.modules.rider.service.*;
import com.oying.modules.rider.utils.Constants;
import com.oying.utils.PageResult;
@@ -114,16 +115,28 @@
        return ResponseEntity.ok(R.success(result));
    }

    // @GetMapping("riderCancelOrder/{orderNum}")
    // @ApiOperation("骑手订单已送达")
    // @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, "订单号不能为空"));
    //     }
    //     R result = riderOrderRecordService.riderCancelOrder(orderNum);
    //     return ResponseEntity.ok(R.success(result));
    // }
    @GetMapping("riderCompleteOrder/{orderNum}")
    @ApiOperation("骑手订单已送达")
    @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, "订单号不能为空"));
        }
        R result = riderOrderRecordService.riderCancelOrder(orderNum);
        return ResponseEntity.ok(R.success(result));
    }

    @GetMapping("riderOperationOrder")
    @ApiOperation("骑手上报到店")
    @PreAuthorize("@el.check('riderOrderRecord:list')")
    public ResponseEntity<?> riderOperationOrder(OrderRiderOperationVo orderRiderOperation) {
        // 订单号不能为空
        if (orderRiderOperation.getOrderNum() == null || orderRiderOperation.getOrderNum().equals("")) {
            return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空"));
        }
        R result = riderOrderRecordService.riderOperationOrder(orderRiderOperation);
        return ResponseEntity.ok(R.success(result));
    }

}