From 651f8e426aa57ec5ebcdfddf840a21449dff4269 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 二月 2023 18:06:43 +0800
Subject: [PATCH] 代理商管理，司机管理部分
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index f21ab1b..bc41214 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -304,7 +304,7 @@
//修改司机状态"空闲"
TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
- driver.setState(2);
+// driver.setState(2);
itDriverService.updateById(driver);
//添加取消记录
@@ -404,7 +404,7 @@
lineShiftDriverMapper.updateById(lineShiftDriver);
if(lineShiftDriver.getLaveSeat() >= lineShiftDriver.getTotalSeat()){
TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
- driver.setState(2);
+// driver.setState(2);
itDriverService.updateById(driver);
}
@@ -437,8 +437,8 @@
if(income.getUserType() == 2){//处理司机的收入
TDriver driver = itDriverService.selectById(income.getObjectId());
driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
- driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
- driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+// driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+// driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
itDriverService.updateById(driver);
}
Income income1 = new Income();
@@ -554,8 +554,8 @@
if(income.getUserType() == 2){//处理司机的收入
TDriver driver = itDriverService.selectById(income.getObjectId());
driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
- driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
- driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+// driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+// driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
itDriverService.updateById(driver);
}
Income income1 = new Income();
@@ -601,23 +601,23 @@
//修改之前司机状态 -- 空闲
TDriver oldDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
- oldDriver.setState(2);
+// oldDriver.setState(2);
itDriverService.updateById(oldDriver);
//查找司机对象
TDriver nowDriver = itDriverService.selectById(driverId);
- nowDriver.setState(3);
+// nowDriver.setState(3);
itDriverService.updateById(nowDriver);
//修改专车订单
tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
tOrderPrivateCar.setDriverId(driverId);
- tOrderPrivateCar.setCarId(nowDriver.getCarId());
+// tOrderPrivateCar.setCarId(nowDriver.getCarId());
itOrderPrivateCarService.updateById(tOrderPrivateCar);
//修改专车改派订单
tReassign.setNowDriverId(driverId);
- tReassign.setNowCarId(nowDriver.getCarId());
+// tReassign.setNowCarId(nowDriver.getCarId());
tReassign.setState(3);
tReassign.setCompleteTime(new Date());
tReassignService.updateById(tReassign);
@@ -663,7 +663,7 @@
lineShiftDriver.setLaveSeatNumber(seat);
lineShiftDriverMapper.updateById(lineShiftDriver);
if(lineShiftDriver.getLaveSeat() >= lineShiftDriver.getTotalSeat()){
- oldDriver.setState(2);
+// oldDriver.setState(2);
itDriverService.updateById(oldDriver);
}
@@ -689,16 +689,16 @@
lineShiftDriver1.setLaveSeatNumber(seat2);
lineShiftDriverMapper.updateById(lineShiftDriver1);
TDriver driver = itDriverService.selectById(driverId);
- if(driver.getState() == 1){
+ /*if(driver.getState() == 1){
return ResultUtil.error("司机还未上班呢");
}
if(driver.getState() == 2){
driver.setState(3);
- }
+ }*/
//修改订单数据
tOrderCrossCity.setDriverId(driverId);
- tOrderCrossCity.setCarId(driver.getCarId());
+// tOrderCrossCity.setCarId(driver.getCarId());
tOrderCrossCity.setSeatNumber(seat1);
tOrderCrossCity.setState(tOrderCrossCity.getOldState());
tOrderCrossCity.setLineShiftDriverId(lineShiftDriver1.getId());
@@ -713,7 +713,7 @@
//修改专车改派订单
tReassign.setNowDriverId(driverId);
- tReassign.setNowCarId(driver.getCarId());
+// tReassign.setNowCarId(driver.getCarId());
tReassign.setState(3);
tReassign.setCompleteTime(new Date());
tReassignService.updateById(tReassign);
@@ -725,12 +725,12 @@
income.setObjectId(driverId);
incomeService.updateById(income);
- oldDriver.setBusinessMoney(oldDriver.getBusinessMoney() - income.getMoney());
- oldDriver.setLaveBusinessMoney(oldDriver.getLaveBusinessMoney() - income.getMoney());
+// oldDriver.setBusinessMoney(oldDriver.getBusinessMoney() - income.getMoney());
+// oldDriver.setLaveBusinessMoney(oldDriver.getLaveBusinessMoney() - income.getMoney());
oldDriver.setBalance(oldDriver.getBalance().subtract(new BigDecimal(income.getMoney())));
- driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
- driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
+// driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
+// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
driver.setBalance(driver.getBalance().add(new BigDecimal(income.getMoney())));
}
@@ -760,11 +760,11 @@
//修改专车订单
tOrderLogistics.setState(tOrderLogistics.getOldState());
tOrderLogistics.setDriverId(driverId);
- tOrderLogistics.setCarId(nowDriver.getCarId());
+// tOrderLogistics.setCarId(nowDriver.getCarId());
orderLogisticsService.updateById(tOrderLogistics);
tReassign.setNowDriverId(driverId);
- tReassign.setNowCarId(nowDriver.getCarId());
+// tReassign.setNowCarId(nowDriver.getCarId());
tReassign.setState(3);
tReassign.setCompleteTime(new Date());
tReassignService.updateById(tReassign);
@@ -776,14 +776,14 @@
TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
- driver.setBusinessMoney(driver.getBusinessMoney() - income.getMoney());
- driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney());
+// driver.setBusinessMoney(driver.getBusinessMoney() - income.getMoney());
+// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney());
itDriverService.updateById(driver);
driver = itDriverService.selectById(driverId);
driver.setBalance(driver.getBalance().add(new BigDecimal(income.getMoney())));
- driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
- driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
+// driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
+// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
itDriverService.updateById(driver);
}
--
Gitblit v1.7.1