更新用户端功能

Pu Zhibing

2025-06-25 70211b41954df4ac1232f48420b89c13fb5fb451

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -118,8 +118,8 @@
    @Autowired
    private PushUtil pushUtil;
    
    @Autowired
    private RedisTemplate redisTemplate;
    @Resource
    private RedisTemplate<String, Object> redisTemplate;

    @Autowired
    private RestTemplate internalRestTemplate;
@@ -2097,27 +2097,6 @@
                        }
                        PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0);
                        System.out.println("pushOrder:"+pushOrder);
                        int i2 = pushOrder.getPushTime() / 10;
                        if(i2==0){
                            i2=1;
                        }
                        System.out.println(i2);
                        for (int i1 = 0; i1 < i2 ; i1++) {
                            Integer state = 0;
                            //批量订单
                            if(type == 3){
                                OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderTaxi.getId());
                                if(null == orderPrivateCar || orderPrivateCar.getState() != 1){
                                    b = true;
                                    break;
                                }
                            }else{
                                state = orderTaxiMapper.selectById(orderTaxi.getId()).getState();
                                if(state != 1){
                                    b = true;
                                    break;
                                }
                            }
                            //获取空闲司机
                            List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
                            if(list.size() > 0){
@@ -2140,11 +2119,15 @@
                                    pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
                                }
                            }
                            Thread.sleep( 10000);//设置等待时间
                        Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                        OrderTaxi orderTaxi1 = OrderTaxiServiceImpl.this.selectById(orderTaxi.getId());
                        Integer state = orderTaxi1.getState();
                        if (state != 1) {
                            break;
                        }
                            if(i == querys.size() && state == 1){
                                pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
                                orderIds.remove(orderTaxi.getId());
                            }
                        }
                    }
                } catch (Exception e) {