From 98a7cb217d580d8c2642570dc8298e9226551928 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 八月 2025 18:44:28 +0800
Subject: [PATCH] bug修改
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 a624639..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
@@ -280,13 +281,16 @@
left join t_user c on (a.userId = c.id)
left join t_driver d on (a.driverId = d.id)
left join t_company e on (d.companyId = e.id)
- left join t_pub_transaction_details f on (a.id = f.orderId and f.orderType = 2 and f.userType = 2)
+ left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
where a.state in (8, 9) and a.isDelete = 1 and a.payManner = 1
<if test="null != paymentCode and '' != paymentCode">
and b.code like CONCAT('%', #{paymentCode}, '%')
</if>
<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}, '%')
@@ -321,7 +325,7 @@
left join t_user c on (a.userId = c.id)
left join t_driver d on (a.driverId = d.id)
left join t_company e on (d.companyId = e.id)
- left join t_pub_transaction_details f on (a.id = f.orderId and f.orderType = 2 and f.userType = 2)
+ left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
where a.state in (8, 9) and a.isDelete = 1 and (a.orderSource in (5, 6) or a.oldPeople = 1 or a.payManner = 2)
<if test="null != orderCode and '' != orderCode">
and a.orderNum like CONCAT('%', #{orderCode}, '%')
--
Gitblit v1.7.1