From 57ea78cd5ce860af3e93762bfa3ab6764eea78e2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 11 七月 2024 11:15:58 +0800
Subject: [PATCH] 提交新版本
---
ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html | 12 +++++++++---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index c09ea6b..616209d 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/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;//企业收入
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
index b125109..750ff00 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
+++ b/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>
--
Gitblit v1.7.1