From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 17:19:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 8bcef47..e96561a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -212,7 +212,7 @@
@ResponseBody
public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception {
TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
-
+ orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
//添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
@@ -245,14 +245,9 @@
}
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
-
-
-
- if(orderPrivateCar.getArriveTime()==null){
- orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
- }
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
+ orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
+
return SUCCESS_TIP;
}
@Resource
--
Gitblit v1.7.1