From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 00847f4..3280f80 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -458,6 +458,16 @@
map = orderCrossCityService.queryOrderInfo(orderId);
break;
}
+
+ if(map.get("companyId") != null){
+ Company companyId = companyService.selectById(map.get("companyId").toString());
+ map.put("companyName", companyId.getName());
+ }else {
+ String string = map.get("driverId").toString();
+ Driver driver = driverService.selectById(string);
+ Company company = companyService.selectById(driver.getCompanyId());
+ map.put("companyName", company.getName());
+ }
if(map.get("telX") != null){
map.put("driverPhone", map.get("telX"));
}
--
Gitblit v1.7.1