From e809f5955584e600d8612540ea814977c49774c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 八月 2025 23:51:54 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
index 6a1dbeb..7eebff6 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
@@ -4,14 +4,19 @@
<select id="list" resultType="java.util.Map">
- select o.id,o.createTime, o.orderNo as orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone, o.payStatus, o.payTime, o.payMoney, o.insertTime, o.companyId
- from t_abnormal_pay_order o left join t_user t2 on o.userId = t2.id
+ select o.id,o.recoveryOrderCreateDate as createTime, o.orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone,o.state,o.payMoney,o.payTime
+ from (
+ select id,userId,recoveryOrderCreateDate,orderNum,passengers,passengersPhone,state,payMoney,companyId,payTime from t_order_private_car a where recoveryOrder = 1
+ UNION all
+ select id,userId,recoveryOrderCreateDate,orderNum,passengers,passengersPhone,state,payMoney,companyId,payTime from t_order_taxi a where recoveryOrder = 1
+ ) o
+ left join t_user t2 on o.userId = t2.id
where 1=1
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ AND (o.recoveryOrderCreateDate between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
<if test="orderNum != null and orderNum != ''">
- and o.orderNo LIKE CONCAT('%',#{orderNum},'%')
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
</if>
<if test="userName != null and userName != ''">
and t2.nickName LIKE CONCAT('%',#{userName},'%')
@@ -31,10 +36,13 @@
<if test="roleType != null and roleType != '' and roleType == 3">
and o.companyId = #{nowUserId}
</if>
- <if test="null != abnormalStatus">
- and o.payStatus = #{abnormalStatus}
+ <if test="null != abnormalStatus and 1 == abnormalStatus">
+ and o.state = 7
</if>
- order by o.createTime desc
+ <if test="null != abnormalStatus and 2 == abnormalStatus">
+ and o.state in (8, 9)
+ </if>
+ order by o.recoveryOrderCreateDate desc
</select>
</mapper>
--
Gitblit v1.7.1