From e345b36025818615eb68d37819eaff312d1fb986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 12:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
index 7b3082d..0d7b42b 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -273,6 +273,7 @@
d.phone as driverPhone,
e.name as company,
f.money as income,
+ b.orderType as orderType,
DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
DATE_FORMAT(b.insertTime, '%Y-%m-%d %H:%i:%s') as paymentTime
from t_order_taxi a
@@ -288,6 +289,9 @@
<if test="null != orderCode and '' != orderCode">
and a.orderNum like CONCAT('%', #{orderCode}, '%')
</if>
+ <if test="null != orderType">
+ and b.orderType = #{orderType}
+ </if>
<if test="null != userPhone and '' != userPhone">
and c.phone like CONCAT('%', #{userPhone}, '%')
</if>
--
Gitblit v1.7.1