From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 739c786..b2192e0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -153,7 +153,7 @@
oldState as oldState,
telX as telX,
bindId as bindId
- from t_order_private_car where isDelete = 1 and userId = #{uid}
+ from t_order_private_car where isDelete = 1 and isFrozen = 1 and userId = #{uid}
<if test="null != orderType">
and orderType = #{orderType}
</if>
@@ -321,7 +321,8 @@
isDelete as isDelete,
oldState as oldState,
telX as telX,
- bindId as bindId
+ bindId as bindId,
+ tripId
from t_order_private_car where isDelete = 1 and userId = #{uid}
<if test="null != state">
and state in
@@ -343,7 +344,11 @@
driverId as driverId,
(1) as orderType,
state as state,
- oldState as oldState
+ oldState as oldState,
+ isFrozen,
+ cancelMidway,
+ tripId,
+ remark
from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -355,7 +360,7 @@
startAddress as startAddress,
endAddress as endAddress,
payMoney as payMoney,
- ('打车订单') as orderName,
+ ('打车') as orderName,
if(invoiceId is null, 1, 2) as invoice,
unix_timestamp(insertTime) as insertTime,
(1) as orderType
@@ -422,14 +427,12 @@
CONCAT(b.firstName, " ", b.lastName) as driverName,
c.carLicensePlate as licensePlate,
c.carColor as carColor,
- CONCAT(f.`name`, d.`name`) as brand,
+ CONCAT(f.`name`, " ", d.`name`) as brand,
((select sum(fraction) from t_order_evaluate where driverId = a.driverId) / (select count(id) from t_order_evaluate where driverId = a.driverId)) as score,
- (
- (select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +
- (select count(id) from t_order_taxi where driverId = a.driverId and state in (7, 8, 9)) +
- (select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9)) +
- (select count(id) from t_order_logistics where driverId = a.driverId and state in (6, 9))
- ) as orderNum,
+ (
+ (select count(id) from t_order_private_car where driverId = a.driverId and state in (6, 7, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.driverId and state in (6, 7, 8, 9))
+ ) as orderNum,
b.phone as driverPhone,
if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
if(a.state = 12, (select id from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
@@ -441,7 +444,12 @@
h.money as cancelMoney,
h.reason as cancelReason,
h.remark as cancelRemark,
- a.isFree,a.moneyType,a.moneyTime
+ a.isFree,
+ a.moneyType,
+ a.moneyTime,
+ a.isFrozen,
+ a.tripId,
+ DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
from t_order_private_car a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
@@ -458,9 +466,9 @@
select
(payMoney * -1) as money,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
- ('打车订单') as name,
+ ('打车') as name,
UNIX_TIMESTAMP(insertTime) as insertTime
- from t_order_private_car where payMoney != 0 and userId = #{uid} and state in (8, 9, 10, 11, 12)
+ from t_order_private_car where payMoney != 0 and userId = #{uid} and state in (8, 9, 10, 11, 12) and payType = 3
</select>
@@ -468,9 +476,9 @@
select
redPacketMoney as money,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
- ('打车订单') as name,
+ ('打车') as name,
UNIX_TIMESTAMP(insertTime) as insertTime
- from t_order_private_car where userId = #{uid} and state in (8, 9) and redPacketId is not null
+ from t_order_private_car where userId = #{uid} and redPacketId is not null
</select>
--
Gitblit v1.7.1