xuhy
2025-04-17 be21dae03f9824c2e94a5e370e3b844e1c3bde03
2.0迭代
4个文件已修改
27 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -258,6 +258,11 @@
            }
            @Override
            public R<String> call(Integer orderId) {
                return R.fail(cause.getMessage());
            }
            @Override
            public R<Boolean> changeOrderState(String orderId, Integer state) {
                return R.fail(cause.getMessage());
            }
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -437,4 +437,11 @@
     */
    @GetMapping(value = "/order/batchUpdateTime")
    R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("time")String time);
    /**
     * 打电话
     * @param orderId
     * @return
     */
    @GetMapping(value = "/order/call")
    R<String> call(@RequestParam("orderId")Integer orderId);
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -886,7 +886,7 @@
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/call")
    public R<String> call(@RequestParam Integer orderId) {
    public R<String> call(@RequestParam("orderId") Integer orderId) {
        Order order = orderService.getById(orderId);
        if(Objects.isNull(order)){
            return R.fail("订单不存在");
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -634,4 +634,17 @@
//        return update ? R.ok("修改成功!") : R.fail("修改失败!");
//    }
    /**
     * 师傅端-打电话
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/workerCall")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
    })
    public R<String> workerCall(@RequestParam Integer orderId) {
        orderClient.call(orderId);
        return R.ok();
    }
}