From 1ccd22706067b95141c83110c142c4a66306dd27 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:08:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index e6123e4..ddb3407 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -142,6 +142,12 @@
}
technician = shopdetail.getData();
}
+ R<TechnicianSubscribe> subscribeR = technicianClient.getSubscribeByOrderId(orderId);
+ if (!R.isSuccess(subscribeR)){
+ throw new ServiceException("获取预约信息失败");
+ }
+ TechnicianSubscribe subscribe = subscribeR.getData();
+
Shop shop = shopR.getData();
orderDetailVO.setId(order.getId());
orderDetailVO.setOrderStatus(order.getOrderStatus());
@@ -166,6 +172,9 @@
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
orderDetailVO.setTechnicianName(technician.getName());
+ if(null != subscribe){
+ orderDetailVO.setTechnicianSubscribeId(String.valueOf(subscribe.getId()));
+ }
return orderDetailVO;
}
--
Gitblit v1.7.1