From f6f4e7beea525f0c450d618fdc93f112c6813edc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:58:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml | 3 ++-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html | 2 +-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html | 2 +-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 2 +-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 2 +-
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 3 ++-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
index 3176efc..8c4060c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
@@ -222,7 +222,8 @@
when ot.payType = 2 then '支付宝'
when ot.payType = 3 then '余额'
when ot.payType = 4 then '云闪付'
- else '预备金' end as payTypeStr,
+ when ot.payType = 5 then '预备金'
+ else '' end as payTypeStr,
sc.`name` as serverCarModel,
CONCAT(di.`name`,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
index 32b7886..5a5886d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -197,7 +197,8 @@
when ot.payType = 2 then '支付宝'
when ot.payType = 3 then '余额'
when ot.payType = 4 then '云闪付'
- else '预备金' end as payTypeStr,
+ when ot.payType = 5 then '预备金'
+ else '' end as payTypeStr,
CONCAT(di.`name`,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
cc.`name` as companyName,ot.*
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html
index c1c3dd2..6c99ec7 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html
@@ -148,7 +148,7 @@
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
- <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ <#label id="payMoney" name="实际支付费用" value=" 元"/>
@}
<#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
index 076141d..49a7b8e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
@@ -68,7 +68,7 @@
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
- <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ <#label id="payMoney" name="实际支付费用" value=" 元"/>
@}
<#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
index fb97401..4c44e87 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -42,7 +42,7 @@
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
- <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ <#label id="payMoney" name="实际支付费用" value="元"/>
@}
@if(isNotEmpty(item.couponMoney)){
<#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
index d25e703..16a4d1e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -148,7 +148,7 @@
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
- <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ <#label id="payMoney" name="实际支付费用" value=" 元"/>
@}
<#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
index 8bc9fb9..1fdf1c1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -77,7 +77,7 @@
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
- <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ <#label id="payMoney" name="实际支付费用" value=" 元"/>
@}
@if(isNotEmpty(item.discountAmount)){
--
Gitblit v1.7.1