xuhy
2025-09-11 5edd84c3d79263a32afdd9564ad0373fc253389f
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -2567,7 +2567,7 @@
//                        PushOrder pushOrder = pushOrderService.querys(i, 4, query.getId()).get(0);
                        //获取同线路的同车型的跨城司机
                        List<Driver> list = driverService.queryDriversByLineAndCarModel(3,orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
                        System.out.println("跨城空闲司机======>"+ list);
                        if(list.size() > 0){
//                            double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
//                            int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数(下标截取)
@@ -2575,7 +2575,8 @@
                            List<Integer> collect = list.stream().map(Driver::getCarId).collect(Collectors.toList());
                            List<Car> cars = carMapper.selectList1( collect);
                            for(Driver driver : list){//开始进行推送
                                // 判断司机的当前进行的订单  看座位数
                                // 判断司机的当前进行的订单  看座位数、
                                System.out.println("当前司机id======>"+ driver.getId());
                                Car car1 = cars.stream().filter(car -> car.getId().equals(driver.getCarId())).findFirst().get();
                                Integer seat = car1.getSeat();
                                List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().eq("driverId", driver.getId()).in("state", Arrays.asList(1,2,3,4,5)));
@@ -2589,7 +2590,9 @@
//                                if(bo){
//                                    continue;
//                                }
                                if(seat>=orderCrossCities.size()){
                                System.out.println("当前司机座位数======>"+ seat);
                                System.out.println("当前司机跨城订单数======>"+ orderCrossCities.size());
                                if(seat>orderCrossCities.size()){
                                    pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 10);
                                }
                            }