liujie
7 天以前 e55fe61ee5c645f885e11d09255c63e5f0c17153
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -410,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);
@@ -640,6 +641,10 @@
            driverWorkMapper.updateById(driverWork);
            driver.setState(1);
            //   更新车辆使用状态
            carService.updateUseState(uid);
            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -656,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);
@@ -703,6 +720,9 @@
            driverWorkMapper.updateById(driverWork);
            driver.setState(1);
            //   更新车辆使用状态
            carService.updateUseState(uid);
            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -712,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);
@@ -903,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();