From 11b3a882856066cf26ad2fe260165785b9929eab Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 20:05:02 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 7 ++++++-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java | 2 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 2 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 7 ++++++-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml | 2 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java | 2 +-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
index be64d28..2f2c35e 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java
@@ -51,7 +51,7 @@
@Param("state") Integer state,
@Param("lon") String lon,
@Param("lat") String lat);
- Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId);
+ Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index cbea92c..0a99479 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -340,7 +340,7 @@
c.remark as cancelRemark,
c.money as cancelPayMoney,
if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
- (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign
+ (select isSpecialCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
from t_order_private_car a
left join t_user b on (a.userId = b.id)
left join t_order_cancel c on (a.id = c.orderId and c.orderType = 1 and c.state = 2)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index b5f8ad0..ebb9553 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -104,6 +104,9 @@
@Resource
private RedisTemplate<String, Object> redisTemplate;
+ @Resource
+ private IOpenCityService openCityService;
+
/**
* 获取司机端首页订单列表
@@ -469,7 +472,9 @@
map.put("emergencyCall", "110");
map.put("orders", JSON.toJSONString(orders));
return map;*/
- Map<String,Object> map = orderPrivateCarMapper.queryOrderInfo2(orderId);
+ OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderId);
+ OpenCity openCity = openCityService.openCity1(orderPrivateCar1.getStartLon().toString(), orderPrivateCar1.getStartLat().toString());
+ Map<String,Object> map = orderPrivateCarMapper.queryOrderInfo2(orderId, openCity.getId());
OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
Integer canOperation=1;
if(orderPrivateCar.getState()<5){
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java
index 633996a..63c40ba 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java
@@ -52,7 +52,7 @@
* @param orderId
* @return
*/
- Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);
+ Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);
/**
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
index 37c2298..b321971 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
@@ -295,7 +295,7 @@
c.remark as cancelRemark,
c.money as cancelPayMoney,
if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
- (select isTaxiCar from t_sys_reformist where companyId = a.companyId) as reassign
+ (select isTaxiCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
from t_order_taxi a
left join t_user b on (a.userId = b.id)
left join t_order_cancel c on (a.id = c.orderId and c.orderType = 2 and c.state = 2)
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