From 2506c3f8e3ef1ace4a258a8c5f93ddd47a51bbd2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 19 九月 2025 16:06:14 +0800
Subject: [PATCH] 修改后台司机授权逻辑判断
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
index 33c3e41..28ce9ad 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
@@ -58,9 +58,6 @@
order by r.startTime asc
</if>
<if test="type==4">
- order by calculate_distance(#{lat},#{lon},r.startLat, r.startLon) asc
- </if>
- <if test="type==5">
order by r.money desc
</if>
LIMIT #{current},#{size}
@@ -97,12 +94,14 @@
SELECT
id AS orderId,
DATE_FORMAT( addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
- DATE_FORMAT( startTime, '%m月%d日 %H:%i' ) AS TIME,
+ DATE_FORMAT( startTime, '%m月%d日 %H:%i' ) AS time,
startName AS startAddress,
endName AS endAddress,
driverId AS driverId,
( 8 ) AS orderType,
1 AS rideUserType,
+ startLon as startLon,
+ startLat as startLat,
state AS state
FROM
app_order_ride
@@ -114,12 +113,14 @@
SELECT
t1.id AS orderId,
DATE_FORMAT( t1.addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
- DATE_FORMAT( t1.startTime, '%m月%d日 %H:%i' ) AS TIME,
+ DATE_FORMAT( t1.startTime, '%m月%d日 %H:%i' ) AS time,
t1.startName AS startAddress,
t1.endName AS endAddress,
t1.driverId AS driverId,
( 8 ) AS orderType,
2 AS rideUserType,
+ t1.startLon as startLon,
+ t1.startLat as startLat,
t1.state AS state
FROM
app_order_travel t1
--
Gitblit v1.7.1