From 53ff6ea7033a550d89368aa3c52377bf2184c5f4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 12 八月 2024 20:54:25 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 3bbc7cf..b025309 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -209,7 +209,7 @@
private ICarService carService;
@Resource
- private DriverWorkMapper driverWorkMapper;
+ private IDriverWorkService driverWorkService;
@@ -501,8 +501,8 @@
}
Driver driver = driverService.selectById(dr.getId());
- DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())
- .eq("state", 1).like("type", "1").getEntity());
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())
+ .eq("state", 1).like("type", "1"));
if(driver.getState() == 2 && null != driverWork){
orderPrivateCar.setDriverId(dr.getId());
orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
@@ -740,7 +740,7 @@
if(null == orderPrivateCar){
return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
}
- if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 12){
+ if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11 && orderPrivateCar.getState() != 12){
return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
}
@@ -839,7 +839,7 @@
}
//修改行程信息
- if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
+ if((orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12) && null != orderPrivateCar.getDriverId()){
fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
}
@@ -1040,8 +1040,8 @@
}
Driver driver1 = driverService.selectById(driver.getId());
- DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
- .eq("state", 1).like("type", "1").getEntity());
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
+ .eq("state", 1).like("type", "1"));
if(driver1.getState() != 2 || null == driverWork){
continue;
}
--
Gitblit v1.7.1