补充

无关风月

2025-02-08 1f41490f50b3861f68e54cd8aebee37549bab3eb

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -308,15 +308,21 @@
                    }
                }
                break;


            case 2://出租
                map = orderTaxiService.queryPushOrder(orderId);
                String order1 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
                String distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order1, 1).get("distance");
                System.err.println("订单数据");
                System.err.println(map);
                String order1 = String.valueOf(map.get("startLat")) + "," + String.valueOf(map.get("startLon"));
                System.err.println("订单经纬度");
                System.err.println(order1);
                String distance1 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, 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"));
                String end1 = String.valueOf(map.get("endLat")) + "," + String.valueOf(map.get("endLon"));
                if(end1.equals(",")){
                    map.put("totalDistance", 0);
                }else{
@@ -945,14 +951,14 @@
                break;
            case 2:
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), 1);
                Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, orderTaxi.getStartLat() + "," + orderTaxi.getStartLon(), 1);
                Double d1 = null != distance1 ? (Double.valueOf(String.valueOf(distance1.get("distance"))) / 1000) : 0;
                if(ToolUtil.isEmpty(orderTaxi.getEndLon())){
                    /*Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), orderTaxi.getEndLon() + "," + orderTaxi.getEndLat(), 1);
                    Double d1_ = null != distance1_ ? (Double.valueOf(String.valueOf(distance1_.get("distance"))) / 1000) : 0;*/
                    content = (orderTaxi.getOrderType() == 1 ? "实时单" : "预约单") + "，距您约" + d1 + "公里。";
                }else{
                    Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), orderTaxi.getEndLon() + "," + orderTaxi.getEndLat(), 1);
                    Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLat() + "," + orderTaxi.getStartLon(), orderTaxi.getEndLat() + "," + orderTaxi.getEndLon(), 1);
                    Double d1_ = null != distance1_ ? (Double.valueOf(String.valueOf(distance1_.get("distance"))) / 1000) : 0;
                    content = (orderTaxi.getOrderType() == 1 ? "实时单" : "预约单") + "，距您约" + d1 + "公里，从" + orderTaxi.getStartAddress() + "到" + orderTaxi.getEndAddress() + "，全程" + d1_ + "公里。";
                }