From 361114b8d93fdfed72881e5446abde578df26ee2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 28 四月 2025 17:45:25 +0800 Subject: [PATCH] 新增加功能 --- ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 4 ++-- 1 files changed, 2 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..7b3082d 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 @@ -280,7 +280,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.payManner = 1 <if test="null != paymentCode and '' != paymentCode"> and b.code like CONCAT('%', #{paymentCode}, '%') @@ -321,7 +321,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