From a075cdd2f76fae321ecf95dce363141ade30f0f1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 12 四月 2024 22:37:58 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 0121710..34b76b9 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>
@@ -343,7 +343,8 @@
driverId as driverId,
(1) as orderType,
state as state,
- oldState as oldState
+ oldState as oldState,
+ isFrozen
from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -441,7 +442,10 @@
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
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)
--
Gitblit v1.7.1