From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29

---
 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 630a5d1..a5649bd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -125,8 +125,8 @@
             for (Store store : storeList) {
                 String storeLon = store.getLon();
                 String storeLat = store.getLat();
-                String result = storeLon + "," + storeLat;
-                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
+//                String result = storeLon + "," + storeLat;
+//                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
                 long l = 0;
 //                try {
 //                    l = Long.parseLong(distanceTOKilometer);
@@ -137,7 +137,11 @@
                 info.setStoreId(store.getId());
                 info.setStoreName(store.getName());
                 info.setStoreImg(store.getCoverDrawing());
-                info.setDistance((long) Double.parseDouble(distanceTOKilometer));
+//                info.setDistance( Double.parseDouble(distanceTOKilometer));
+
+                Map<String, Double> distance = GeodesyUtil.getDistance(list.getLongitude() + "," + list.getLatitude(), storeLon + "," + storeLat);
+                double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                info.setDistance(wgs84);
 
 
                 String str = store.getAddress();

--
Gitblit v1.7.1