update

liujie

5 小时以前 6027bc824afa03e2ef2151d71ccb317fa6fefe2e

update

 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,

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml

@@ -229,7 +229,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,
        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,

 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.*

 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}"/>

 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>

 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}元"/>

 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}"/>

 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)){