From 28e148e28986a08414a4c690a5e5e7ecdc87f9a7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:56:06 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 80b2701..761e58c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -225,11 +225,13 @@
         when ot.orderSource = 4 then '司机下单'
         when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
         ui.nickName as userName,ui.phone as userPhone,
-        case when ot.payType = 1 then '微信'
-        when ot.payType = 2 then '支付宝'
-        when ot.payType = 3 then '余额'
-        when ot.payType = 4 then '云闪付'
-        else '预备金' end as payTypeStr,
+        case when ot.state not in (8, 9) then '' else
+        (case when ot.payType = 1 then '微信'
+              when ot.payType = 2 then '支付宝'
+              when ot.payType = 3 then '余额'
+              when ot.payType = 4 then '云闪付'
+              when ot.payType = 5 then '预备金'
+              else '' end) end as payTypeStr,
         sc.`name` as serverCarModel,
         case when income1.type = 1 then income1.money else 0 end as platIncome,
         case when income1.type = 2 then income1.money else 0 end as companyIncome,

--
Gitblit v1.7.1