xuhy
2025-01-13 671ea52eb1f1ea63f0fa490ba38780ef8fea6aee
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -379,6 +379,13 @@
            order.setSiteName(site.getSiteName());
        }
        Order orderData = orderClient.detail(order.getOrderId()).getData();
        if(orderData.getState()==0 && (!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){
            // 修改sys_change_dispatch 为已改派
            dispatchClient.changeReason(order.getOrderId(),"");
        }
        // 师傅信息
        if (null != order.getServerId()) {
            MasterWorker masterWorker = masterWorkerService.lambdaQuery()
@@ -923,7 +930,6 @@
                System.out.println("服务端发送消息到: " + order.getServerId());
                NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单,请注意查收!");
            }
            return data ? R.ok() : R.fail();
        }
        return R.ok();
    }