From 846f8e416e86ee5f5f33da0977d605f355bcf75a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 08 八月 2025 15:15:16 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
index bacd4ab..324ebb8 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderTravelMapper.xml
@@ -26,7 +26,7 @@
<!--顺风车司机订单行程 type :1待处理的订单，2根据线路、时间，人数综合匹配排序 3按时间排序，4距离最近排序 and r.startTime>=now()-->
<select id="getOrderTravel" resultType="com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideVo">
select r.*,calculate_distance(#{lat},#{lon},r.startLat, r.startLon) as distance,d.totalOrders,u.sex,u.avatar as headImg,u.nickName as name,
- r.id as driverOrderId,i.id as userOrderId
+ r.id as driverOrderId,i.id as userOrderId, r.startLon as lon, r.startLat as lat
from app_order_travel r
left join app_order_ride i on i.travelId=r.id
left join t_user u on u.driverId = r.driverId
@@ -60,7 +60,7 @@
<select id="getOrderInfo" resultType="com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo">
select t.addTime,r.startTime,r.endName,r.startName,r.money,r.id as userOrderId,r.state,t.id as driverOrderId,r.isComplaint,r.num,
r.userId,r.driverId,u.avatar as headImg,u.phone,u.sex,u.nickName as realName as name,d.carNum,d.carType,d.totalOrders,IFNULL(format(d.evaluateScore/d.evaluateNum,2),0)as evaluateScore,r.evaluateScoreUser,r.isEvaluate
- ,r.content
+ ,r.content,t.startLat as lat, t.startLon as lon
from (select * from app_order_travel where id= #{driverOrderId}) t
left join app_order_ride r on t.id=r.travelId
left join app_driver_ride d on d.id=t.driverId
--
Gitblit v1.7.1