From f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 八月 2025 23:53:05 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 219 insertions(+), 0 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
index a31e3b6..464e1b3 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
@@ -17,4 +17,223 @@
`type` as `type`
from t_driver_service where driverId = #{uid}
</select>
+ <select id="queryOrderDataFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
+ select * from (
+ select
+ orderNum,
+ 1 as type,
+ insertTime as orderTime,
+ id as orderId,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state,
+ orderMoney
+ from t_order_private_car
+ where driverId = #{uid} and state !=10
+ <if test="sTime !=null">
+ and insertTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 2 as type,
+ insertTime as orderTime,
+ id as orderId,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state,
+ orderMoney
+ from t_order_taxi
+ where driverId = #{uid} and state !=10
+ <if test="sTime !=null">
+ and insertTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 3 as type,
+ insertTime as orderTime,
+ id as orderId,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state,
+ orderMoney
+ from t_order_cross_city
+ where driverId = #{uid} and state !=10
+ <if test="sTime !=null">
+ and insertTime between #{sTime} and #{eTime}
+ </if>
+ ) t1
+ order by t1.orderTime desc
+
+
+
+
+
+
+
+ </select>
+ <select id="queryOrderMoneyDataFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
+ select
+ incomeId as orderId,
+ orderType as type,
+ insertTime as orderTime,
+ money as orderMoney
+ from t_income
+ where userType =2 and objectId = #{uid} and type =2
+ <if test="sTime !=null">
+ and insertTime between #{sTime} and #{eTime}
+ </if>
+ order by insertTime desc
+
+
+
+
+
+
+
+ </select>
+ <select id="queryOrderMoneyDataFromDriverAll" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
+ select
+ orderType as type,
+ insertTime as orderTime,
+ money as orderMoney
+ from t_income
+ where userType =2 and objectId = #{uid} and type =2
+ <if test="sTime !=null">
+ and insertTime between #{sTime} and #{eTime}
+ </if>
+ order by insertTime desc
+ </select>
+
+ <select id="queryOrderPromotionFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
+ select * from (
+ select
+ orderNum,
+ 1 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_private_car
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 2 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_taxi
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 3 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_cross_city
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+ ) t1
+ order by t1.orderTime desc
+
+
+
+
+
+
+
+ </select>
+
+ <select id="queryOrderPromotionFromDriverAll" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
+ select * from (
+ select
+ orderNum,
+ 1 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_private_car
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 2 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_taxi
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+
+ union all
+
+ select
+ orderNum,
+ 3 as type,
+ successTime as orderTime,
+ id as orderId,
+ boardingAddress as startAddress,
+ getoffAddress as endAddress,
+ state,
+ promotionMoney as orderMoney
+ from t_order_cross_city
+ where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
+ <if test="sTime !=null">
+ and successTime between #{sTime} and #{eTime}
+ </if>
+ ) t1
+ order by t1.orderTime desc
+
+
+
+
+
+
+
+ </select>
+
+
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1