Pu Zhibing
2025-05-09 2cb4235628596addccc2429faf44c4f7bdb8b488
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -225,9 +225,10 @@
                PushOrder pushOrder = pushOrderService.querys(1, 1, company.getId()).get(0);
                //获取空闲司机
                List<Driver> list = driverService.queryIdleDriver(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
                System.err.println("【" + orderPrivateCar.getId() + "】空闲司机:" + JSON.toJSONString(list));
                System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派空闲司机:" + JSON.toJSONString(list));
                drivers = list.stream().filter(d -> !d.getId().equals(orderPrivateCar.getDriverId())).collect(Collectors.toList());
                if(drivers.size() > 0) {//有司机,直接指派给司机
                    System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派候选司机:" + JSON.toJSONString(drivers));
                    Driver dr = null;
                    if (drivers.size() > 1) {
                        List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
@@ -269,10 +270,11 @@
                    } else {
                        dr = drivers.get(0);
                    }
                    System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派司机:" + JSON.toJSONString(dr));
                    Driver driver1 = driverService.selectById(dr.getId());
                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())
                            .eq("state", 1).like("type", "1"));
                    if(driver.getState() == 2 && null != driverWork) {
                    if(driver1.getState() == 2 && null != driverWork) {
                        String text = "";
                        reassign.setState(3);
                        reassign.setNowDriverId(driver1.getId());
@@ -571,9 +573,10 @@
                PushOrder pushOrder1 = pushOrderService.querys(1, 1, company1.getId()).get(0);
                //获取空闲司机
                List<Driver> list1 = driverService.queryIdleDriver(orderLogistics.getUserId(), orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder1.getPushDistance(), null);//所有附近空闲司机
                System.err.println("【" + orderLogistics.getId() + "】空闲司机:" + JSON.toJSONString(list1));
                System.err.println("【" + orderLogistics.getId() + "】订单改派-指派空闲司机:" + JSON.toJSONString(list1));
                drivers = list1.stream().filter(d -> !d.getId().equals(orderLogistics.getDriverId())).collect(Collectors.toList());
                if(drivers.size() > 0){//有司机,直接指派给司机
                    System.err.println("【" + orderLogistics.getId() + "】订单改派-指派候选司机:" + JSON.toJSONString(drivers));
                    Driver dr = null;
                    if(drivers.size() > 1){
                        List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
@@ -615,7 +618,7 @@
                    }else{
                        dr = drivers.get(0);
                    }
                    System.err.println("【" + orderLogistics.getId() + "】订单改派-指派司机:" + JSON.toJSONString(dr));
                    Driver driver1 = driverService.selectById(dr.getId());
                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
                            .eq("state", 1).like("type", "4"));