Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-24 39c58fe1a0469b99bd5ef0a24f6b254693826a18

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java

@@ -208,18 +208,18 @@
        
        //修改之前司机状态 -- 空闲
        TDriver oldDriver = tDriverService.selectById(tOrderTaxi.getDriverId());
        oldDriver.setState(2);
//        oldDriver.setState(2);
        tDriverService.updateById(oldDriver);

        //查找司机对象
        TDriver nowDriver = tDriverService.selectById(driverId);
        nowDriver.setState(3);
//        nowDriver.setState(3);
        tDriverService.updateById(nowDriver);

        //修改出租车订单
        tOrderTaxi.setState(tOrderTaxi.getOldState());
        tOrderTaxi.setDriverId(driverId);
        tOrderTaxi.setCarId(nowDriver.getCarId());
//        tOrderTaxi.setCarId(nowDriver.getCarId());
        tOrderTaxiService.updateById(tOrderTaxi);

        //增加推送
@@ -241,7 +241,7 @@

        //修改之前司机状态 -- 空闲
        TDriver driver = tDriverService.selectById(tOrderTaxi.getDriverId());
        driver.setState(2);
//        driver.setState(2);
        tDriverService.updateById(driver);

        tOrderTaxi.setState(10);