From de9d3974b9068ffc0893f62d33b50e3864603c80 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:38:56 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 7 +++++--
1 files changed, 5 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 7c8f569..40a2a35 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
@@ -351,12 +351,12 @@
new Thread(new Runnable() {
@Override
public void run() {
+ pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2);
pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
}
}).start();
}
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
- orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
@@ -597,7 +597,7 @@
if(orderPrivateCar.getIsplatPay()==2){
return "error";
}
- //添加已收入明细
+ //添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
BigDecimal d = null;//企业收入
@@ -619,6 +619,9 @@
driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
driverService.updateById(driver);
orderPrivateCar.setIsplatPay(2);
+ orderPrivateCar.setPayManner(1);
+ orderPrivateCar.setState(8);
+ orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1