zhibing.pu
2024-07-11 57ea78cd5ce860af3e93762bfa3ab6764eea78e2
提交新版本
2个文件已修改
14 ■■■■ 已修改文件
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -255,7 +255,7 @@
        if(orderPrivateCar.getIsplatPay()==2){
            return "error";
        }
    //添加已收入明细
        //添加已收入明细
        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
        Double taxi = company.getSpeMoney().doubleValue();
        BigDecimal d = null;//企业收入
ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -97,9 +97,15 @@
                            @if(shiro.hasPermission("/tOrderPrivateCar/downloadExcel")){
                            <#button name="导出订单" icon="fa-download" clickFun="TOrderPrivateCar.downloadExcel()" space="true"/>
                            @}
                            <#button name="平台支付" icon="fa-edit" clickFun="TOrderPrivateCar.platPay()" space="true"/>
                            <#button name="修改金额" icon="fa-edit" clickFun="TOrderPrivateCar.changeMoney()" space="true"/>
                            <#button name="冻结/解冻订单" icon="fa-edit" clickFun="TOrderPrivateCar.frozenOrder()" space="true"/>
                            @if(shiro.hasPermission("/tOrderPrivateCar/platformPayment")){
                            <#button name="平台支付" icon="fa-edit" clickFun="TOrderPrivateCar.platPay()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/modificationAmount")){
                            <#button name="修改金额" icon="fa-edit" clickFun="TOrderPrivateCar.changeMoney()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/freeze-unfreezeOrders")){
                            <#button name="冻结/解冻订单" icon="fa-edit" clickFun="TOrderPrivateCar.frozenOrder()" space="true"/>
                            @}
                        </div>
                        <#table id="TOrderPrivateCarTable"/>
                    </div>