liujie
9 天以前 086fd5d2392b9028cf1159aec7cd47ddd1eb4d07
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -170,9 +170,7 @@
   @Autowired
   private ITaxiCardService taxiCardService;
   
   @Autowired
   private ITaxiCardPaymentService taxiCardPaymentService;
   @Autowired
   private IUserUserService userUserService;
   
@@ -1959,7 +1957,7 @@
      //计算预计距离和剩余时间
      String value = null;
      if (null != orderTaxi.getDriverId()) {
         value = (String) redisTemplate.opsForValue().get("DRIVER" + orderTaxi.getDriverId());
         value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderTaxi.getDriverId());
         if (null == value || "".equals(value)) {
            System.err.println("司机没有上传位置信息");
            
@@ -2337,7 +2335,7 @@
                     }
                  }
                  Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                  OrderTaxi orderTaxi1 = OrderTaxiServiceImpl.this.selectById(orderTaxi.getId());
                  OrderPrivateCar orderTaxi1 = orderPrivateCarService.selectById(orderTaxi.getId());
                  Integer state = orderTaxi1.getState();
                  if (state != 1) {
                     break;