From 73195f372cdb8d59b74ee86b76fbf4c9595caea1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 十月 2025 19:01:41 +0800
Subject: [PATCH] 虚拟号修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 82c3006..eae3271 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
@@ -373,16 +373,16 @@
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, order.getServerId())
.eq(MasterWorker::getIsDelete, 0).one();
- try{
- // 虚拟号码 师傅号码备案
- String fileName = privateNumberUtil.uploadNumberFile(masterWorker.getProfilePicture()).getData();
- R r = privateNumberUtil.addANumber(masterWorker.getPhone(), masterWorker.getRealName(), masterWorker.getIdNumber(), fileName);
- }catch (Exception e){
- throw new GlobalException("虚拟号码绑定异常！");
- }
// 虚拟号码配置
IamConfig iamConfig = iamConfigService.getById(1);
if(Objects.nonNull(order.getIsOpenVirtualNumber()) && order.getIsOpenVirtualNumber() == 1){
+ try{
+ // 虚拟号码 师傅号码备案
+ String fileName = privateNumberUtil.uploadNumberFile(masterWorker.getProfilePicture()).getData();
+ R r = privateNumberUtil.addANumber(masterWorker.getPhone(), masterWorker.getRealName(), masterWorker.getIdNumber(), fileName);
+ }catch (Exception e){
+ throw new GlobalException("虚拟号码绑定异常！");
+ }
// 虚拟号码绑定
String result = AXBUtil.axbBindNumber(iamConfig.getAppKey(), iamConfig.getAppSecret(), iamConfig.getVirtualNumber(), order.getReservationPhone(), masterWorker.getPhone());
// 存储绑定后的唯一标识
@@ -477,15 +477,18 @@
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, orderReasinDto.getWorkerId())
.eq(MasterWorker::getIsDelete, 0).one();
- try{
- // 虚拟号码 师傅号码备案
- String fileName = privateNumberUtil.uploadNumberFile(masterWorker.getProfilePicture()).getData();
- R r = privateNumberUtil.addANumber(masterWorker.getPhone(), masterWorker.getRealName(), masterWorker.getIdNumber(), fileName);
- if(r.getCode() == 500){
- throw new GlobalException(r.getMsg());
+ Order order1 = orderClient.detail(orderId.getOrderId()).getData();
+ if(Objects.nonNull(order1.getIsOpenVirtualNumber()) && order1.getIsOpenVirtualNumber() == 1){
+ try{
+ // 虚拟号码 师傅号码备案
+ String fileName = privateNumberUtil.uploadNumberFile(masterWorker.getProfilePicture()).getData();
+ R r = privateNumberUtil.addANumber(masterWorker.getPhone(), masterWorker.getRealName(), masterWorker.getIdNumber(), fileName);
+ if(r.getCode() == 500){
+ throw new GlobalException(r.getMsg());
+ }
+ }catch (Exception e){
+ throw new GlobalException("虚拟号码绑定异常！");
}
- }catch (Exception e){
- throw new GlobalException("虚拟号码绑定异常！");
}
Order order = orderClient.exchangeOrder(orderId.getType(), orderId.getOrderId(), orderReasinDto.getWorkerId(),
masterWorker.getRealName(), masterWorker.getPhone()).getData();
--
Gitblit v1.7.1