From ea719b0443b8ccbc6d17349796936664ff3261d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:04:43 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 55f4918..83ef04a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -68,6 +68,7 @@
<result column="laveBusinessMoney" property="laveBusinessMoney" />
<result column="laveBusinessMoney" property="laveBusinessMoney" />
<result column="appletsOpenId" property="appletsOpenId"/>
+ <result column="email" property="email"/>
<result column="flag" property="flag"/>
@@ -168,6 +169,7 @@
<select id="queryIdleDriver_" resultType="Driver">
+ select * from (
select
id as id,
account as account,
@@ -251,10 +253,16 @@
)
and id in (select driverId from t_driver_orders where `type` = #{type})
and carId in (select carId from t_car_service where `type` = #{type}
+
<if test="null != serverCarModelId">
and serverCarModelId = #{serverCarModelId}
</if>
)
+ ) as aa where aa.id not in (
+ select driverId from t_order_private_car where isDelete = 1 and driverPay = 1 and state in (7, 8, 9)
+ union all
+ select driverId from t_order_logistics where isDelete = 1 and driverPay = 1 and state != 10
+ )
</select>
--
Gitblit v1.7.1