Pu Zhibing
昨天 d6ad5bd0c95b6ebe6361d74ff297d1a9f4b759fa
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -386,19 +386,22 @@
                }
                break;
            case 2://出租
                OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                if(null != orderPrivateCar && orderPrivateCar.getType() == 3){
                    map = orderPrivateCarService.queryPushOrder(orderId);
                }else{
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                if(null != orderTaxi && orderTaxi.getType() == 2){
                    map = orderTaxiService.queryPushOrder(orderId);
                }else{
                    OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                    if(null != orderPrivateCar && orderPrivateCar.getType() == 3){
                        map = orderPrivateCarService.queryPushOrder(orderId);
                    }else{
                        map = orderTaxiService.queryPushOrder(orderId);
                    }
                }
                String order1 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
                // TODO: 2023/11/4 无法修改
                String distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order1, 1).get("distance");
                map.put("startDistance", ToolUtil.isNotEmpty(distance1) ? Double.valueOf(distance1) / 1000 : 0);
                //总距离
                String end1 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
                if(end1.equals(",")){
                    map.put("totalDistance", 0);
@@ -413,7 +416,6 @@
                    }
                }
                Integer orderSource1 = Integer.valueOf(String.valueOf(map.get("orderSource")));
                if(orderSource1 == 1 || orderSource1 == 2 || orderSource1 == 3){