From 722db9e28a0c8e33d79621c66c0ecf1d60fcf0f6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 09:55:11 +0800
Subject: [PATCH] 7.17
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 7904ced..0121710 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
@@ -337,14 +337,14 @@
select
id as orderId,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
- DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as time,
+ DATE_FORMAT(travelTime, '%m-%d %H:%i') as time,
startAddress as startAddress,
endAddress as endAddress,
driverId as driverId,
(1) as orderType,
state as state,
oldState as oldState
- from t_order_private_car where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
+ from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -355,7 +355,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,7 +422,7 @@
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)) +
@@ -458,9 +458,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,7 +468,7 @@
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
</select>
--
Gitblit v1.7.1