From 415017b0673c08818997189b44af8f1d04a55078 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 05 八月 2025 20:08:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index d1075d1..0a007d2 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -75,6 +75,9 @@
 
     @Autowired
     private TDriverPromotionActivityService driverPromotionActivityService;
+    
+    @Resource
+    private IOpenCityService openCityService;
 
 
 
@@ -473,7 +476,9 @@
      */
     @Override
     public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
-        return orderTaxiMapper.queryOrderInfo(orderId);
+        OrderTaxi orderTaxi = this.selectById(orderId);
+        OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
+        return orderTaxiMapper.queryOrderInfo(orderId, openCity.getId());
     }
 
 

--
Gitblit v1.7.1