8.18

liujie

2025-08-20 f9bbbfeabe3d2690679cef7583ac1c42912706db

8.18

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1971,8 +1971,11 @@
        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
        if(orderCrossCities.size() == 0){
            Driver driver = driverService.selectById(orderCrossCity.getDriverId());
            if(driver!=null){
            driver.setState(2);
            driverService.updateById(driver);
            }

        }
//        }
//        else{
@@ -2592,7 +2595,7 @@
                        }
//                        if(i == querys.size() && state == 1){
                        if(i == 3 && state == 1){
                            pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
                            pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3);
                            orderIds.remove(orderCrossCity.getId());
                                orderCrossCity.setState(10);
                                orderCrossCityMapper.updateById(orderCrossCity);