From 8bd65ed0eab661b4d76c26650be445686f889ca5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |    7 +++++++
 1 files changed, 7 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 ded5565..6e38450 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
@@ -209,6 +209,13 @@
         orderDetailVO.setShopId(shop.getId());
         orderDetailVO.setTechnicianName(technician.getName());
         orderDetailVO.setTechnicianId(technician.getId());
+        if(order.getOrderType() == 1){
+            List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+            if(data.size() > 0){
+                Long id = data.get(0).getId();
+                orderDetailVO.setTechnicianSubscribeId(id.toString());
+            }
+        }
         return orderDetailVO;
     }
 

--
Gitblit v1.7.1