From ebeb3e4f16972caa50f9b78cb334b0beba1acf2d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 17:16:48 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 0738804..cadb4e5 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
@@ -206,7 +206,7 @@
orderPrivateCar.setOrderMoney(money);
orderPrivateCar.setPayMoney(money);
orderPrivateCar.setState(7);
- orderPrivateCar.setIsDispute(1);
+ orderPrivateCar.setIsDispute(3);
orderPrivateCar.updateById();
return SUCCESS_TIP;
}
@@ -349,12 +349,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;
@@ -593,7 +593,7 @@
if(orderPrivateCar.getIsplatPay()==2){
return "error";
}
- //添加已收入明细
+ //添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
BigDecimal d = null;//企业收入
@@ -615,6 +615,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