From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/util/GDMapGeocodingUtil.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/GDMapGeocodingUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/GDMapGeocodingUtil.java
index a260b46..45794d3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/GDMapGeocodingUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/GDMapGeocodingUtil.java
@@ -189,7 +189,7 @@
      * @param endLonLat   结束经纬度(目标经纬度)
      * @return java.lang.Long 两个定位点之间的距离
      */
-    public String getDistanceTOKilometer(String startLonLat, String endLonLat) {
+    public double getDistanceTOKilometer(String startLonLat, String endLonLat) {
         try {
             // 返回起始地startAddr与目的地endAddr之间的距离,单位:米
             Long result = new Long(0);
@@ -200,11 +200,12 @@
             String queryResult = getResponse(queryUrl);
             JSONObject job = JSONObject.parseObject(queryResult);
             JSONArray ja = job.getJSONArray("results");
+            if (ja.size() == 0){
+                return 0.00;
+            }
             JSONObject jobO = JSONObject.parseObject(ja.getString(0));
             result = Long.parseLong(jobO.get("distance").toString());
-            double kilDis = (double) result / 1000;
-            DecimalFormat decimalFormat = new DecimalFormat("#.00");
-            return decimalFormat.format(kilDis);
+            return (double) result / 1000;
         } catch (Exception e) {
             throw new RuntimeException();
         }

--
Gitblit v1.7.1