From 86211b26d8430b70bf68a77edab310ee5ec6017b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 十月 2025 16:40:45 +0800
Subject: [PATCH] 虚拟号修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 16 +++++++---------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 1 +
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index eae3271..896d700 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -361,14 +361,6 @@
if (!StringUtils.hasLength(orderId)) {
return R.fail(saveResult.getMsg());
}
- System.out.println("服务人员id:" + order.getServerId());
- ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(order.getServerId()));
- System.out.println("socket连接信息:" + context);
- if (null != context) {
- System.out.println("服务端发送消息到: " + order.getServerId());
- NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
- }
-
if (null != order.getServerId()) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, order.getServerId())
@@ -391,7 +383,13 @@
orderClient.updateSubscriptionId(orderId, subscriptionId,iamConfig.getVirtualNumber());
}
}
-
+ System.out.println("服务人员id:" + order.getServerId());
+ ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(order.getServerId()));
+ System.out.println("socket连接信息:" + context);
+ if (null != context) {
+ System.out.println("服务端发送消息到: " + order.getServerId());
+ NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
+ }
return StringUtils.hasLength(orderId) ? R.ok() : R.fail();
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 05cfac3..14655f1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -492,6 +492,7 @@
}
order.setProvinceCode(orderRequest.getProvinceCode());
order.setAreaCode(orderRequest.getAreaCode());
+ order.setIsOpenVirtualNumber(orderRequest.getIsOpenVirtualNumber());
return R.ok(orderService.updateById(order));
}
--
Gitblit v1.7.1