From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml
index 60f2f76..85b1481 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml
@@ -340,7 +340,7 @@
startAddress as startAddress,
endAddress as endAddress,
driverId as driverId,
- (1) as orderType,
+ (7) as orderType,
state as state,
oldState as oldState
from t_order_transfer where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
@@ -425,7 +425,7 @@
(select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 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 money from t_order_cancel where orderId = a.id and orderType = 7 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 = 7 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,
g.fraction as orderScore,
g.content as evaluate,
@@ -439,8 +439,8 @@
left join t_car c on (a.carId = c.id)
left join t_car_model d on (c.carModelId = d.id)
left join t_car_brand f on (d.brandId = f.id)
- left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 1)
- left join t_order_cancel h on (a.id = h.orderId and h.orderType = 1 and h.state = 2)
+ left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 7)
+ left join t_order_cancel h on (a.id = h.orderId and h.orderType = 7 and h.state = 2)
where a.id = #{orderId}
</select>
--
Gitblit v1.7.1