From eeebf2d723433f916ba9c33cce92431165dd64c7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 10:04:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 48de09f..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,7 +245,7 @@
}
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
+ orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
--
Gitblit v1.7.1