From 50c6237e3728fe870b5b0ff4af59063bb0bc04cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:18 +0800
Subject: [PATCH] update
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index c1b3a08..736466e 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -395,6 +395,11 @@
@Override
public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid) throws Exception {
Driver driver = this.selectById(uid);
+ //调用中台接口校验实名信息
+ Boolean auth = UserUtil.idCardAuth(registeredWarpper.getName(), registeredWarpper.getIdCard());
+ if(!auth){
+ return ResultUtil.error("实名认证失败，请输入正确的姓名和身份证号码");
+ }
driver.setName(registeredWarpper.getName());
driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
@@ -405,6 +410,7 @@
driver.setCityCode(registeredWarpper.getCityCode());
driver.setProvince(registeredWarpper.getProvince());
driver.setProvinceCode(registeredWarpper.getProvinceCode());
+ driver.setCompanyId(registeredWarpper.getCompanyId());
String code = registeredWarpper.getAreaCode();
Company query = companyCityService.query(code);
@@ -453,7 +459,7 @@
boolean b = true;
for(String t : split){
for(DriverService driverService : list){
- if(driverService.getType() == Integer.valueOf(t)){
+ if(driverService.getType().equals(Integer.valueOf(t))){
b = false;
break;
}
@@ -635,6 +641,10 @@
driverWorkMapper.updateById(driverWork);
driver.setState(1);
+ // 更新车辆使用状态
+ carService.updateUseState(uid);
+
+
new Thread(new Runnable() {
@Override
public void run() {
@@ -651,6 +661,18 @@
return ResultUtil.error("车辆正在使用中");
}
}
+
+ //判断车辆是否正在使用中
+ Car car = carService.selectById(driver.getCarId());
+ if(car.getUseDriverId() != null && !car.getUseDriverId().equals(uid)){
+ return ResultUtil.error("当前绑定车辆正在使用中，请更换车辆");
+ }else if(car.getUseDriverId()==null){
+ car.setUseDriverId(uid);
+ carService.updateById(car);
+ }
+
+
+
driverWork = new DriverWork();
driverWork.setState(1);
driverWork.setDriverId(uid);
@@ -698,6 +720,9 @@
driverWorkMapper.updateById(driverWork);
driver.setState(1);
+ // 更新车辆使用状态
+ carService.updateUseState(uid);
+
new Thread(new Runnable() {
@Override
public void run() {
@@ -707,6 +732,18 @@
}
}).start();
}else{
+
+ //判断车辆是否正在使用中
+ Car car = carService.selectById(driver.getCarId());
+ if(car.getUseDriverId() != null && !car.getUseDriverId().equals(uid)){
+ return ResultUtil.error("当前绑定车辆正在使用中，请更换车辆");
+ }else if(car.getUseDriverId()==null){
+ car.setUseDriverId(uid);
+ carService.updateById(car);
+ }
+
+
+
driverWork = new DriverWork();
driverWork.setState(1);
driverWork.setDriverId(uid);
@@ -898,10 +935,17 @@
if(driver.getState() == 3){
return ResultUtil.error("还在服务中，不能更换");
}
- boolean idle = carService.idle(carId);
+// boolean idle = carService.idle(carId);
+ // 修改是否别司机在使用
+ boolean idle = carService.useState(carId,uid);
if(!idle){
return ResultUtil.error("当前车辆已经有其他司机在使用，请更换车辆");
}
+ // 将所有绑定他的车 =null
+ carService.updateUseState(carId,uid);
+ Car car = carService.selectById(carId);
+ car.setUseDriverId(uid);
+ carService.updateById( car);
driver.setCarId(carId);
this.updateById(driver);
return ResultUtil.success();
--
Gitblit v1.7.1