From af335bf1ef9104dc62c721e142eca790356d18b6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:25 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
index d90b185..b006d0c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -77,7 +77,7 @@
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
- left join t_order_cancel as oc on (ot.id = oc.orderId and oc.orderType = 4 and oc.state = 2)
+ left join t_order_cancel as oc on (ot.id = oc.orderId and oc.orderType = 4)
) as o
<where>
o.isDelete = 1
@@ -148,7 +148,8 @@
oc.money as cancelMoney,
case when oc.payType = 1 then '手机支付'
when oc.payType = 2 then '银行卡支付'
- when oc.payType = 3 then '余额支付' else '现金支付' end as cancelPayTypeStr
+ when oc.payType = 3 then '余额支付'
+ when oc.payType = 4 then '现金支付'else '' end as cancelPayTypeStr
FROM t_order_logistics as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
--
Gitblit v1.7.1