补充

无关风月

2025-02-08 1f41490f50b3861f68e54cd8aebee37549bab3eb

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java

@@ -233,12 +233,12 @@
            case 2:
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                driverId = orderTaxi.getDriverId();
                startLonLat = orderTaxi.getStartLon() + "," + orderTaxi.getStartLat();
                startLonLat = orderTaxi.getStartLat() + "," + orderTaxi.getStartLon();
                state = orderTaxi.getState();
                oldState = orderTaxi.getOldState();
                startServiceTime = null != orderTaxi.getStartServiceTime() ? orderTaxi.getStartServiceTime().getTime() : null;
                servedMileage = orderTaxi.getMileage();
                endLonLat = orderTaxi.getEndLon() + "," + orderTaxi.getEndLat();
                endLonLat = orderTaxi.getEndLat() + "," + orderTaxi.getEndLon();
                break;
            case 3:
                OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
@@ -256,6 +256,9 @@
        if(null == value || "".equals(value)){
            System.err.println("司机没有上传位置信息");
        }
        // todo 注意 因更换地图为百度 两者lon和lat位置互换了
        String[] split = value.split(",");
        value = split[1] + "," + split[0];
        Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, startLonLat, 1);
        String d = "0";
        String t = "0";