xuhy
2025-04-17 6e70ee2d0b73f70fe1140cc7d51c4e847d50aa51
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -653,10 +653,10 @@
     */
    @ApiOperation(value = "师傅端-订单列表", tags = {"师傅端"})
    @GetMapping(value = "/orderListWorker")
    public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
    public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
                                          @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(orderService.orderListWorker(userId, state, pageNum, pageSize));
        return R.ok(orderService.orderListWorker(userId, state, searchValues,pageNum, pageSize));
    }
    /**
@@ -885,4 +885,19 @@
        return R.ok(orderService.placeOrder(userOrderRequest));
    }
    /**
     * 师傅端-打电话
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/call")
    public R<String> call(@RequestParam Integer orderId) {
        Order order = orderService.getById(orderId);
        if(Objects.isNull(order)){
            return R.fail("订单不存在");
        }
        order.setState(2);
        orderService.updateById(order);
        return R.ok();
    }
}