From 5fee7383dbf17f62f0ec3b26a538fbef9b70eede Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 17:55:30 +0800
Subject: [PATCH] 修改启动异常

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 34d074c..d4e899b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -29,7 +29,7 @@
 
     @Override
     public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
-        return shopMapper.selectNearbyShopList(longitude,latitude);
+        return shopMapper.selectNearbyShopList(longitude,latitude); 
     }
 
     @Override
@@ -41,11 +41,13 @@
         }
 
         // 计算距离
-        String shopLocation = String.format("%s,%s", shopDetailVO.getLongitude(), shopDetailVO.getLatitude());
-        String userLocation = String.format("%s,%s", longitude, latitude);
-        Map<String, Double> distanceMap = GeodesyUtil.getDistance(userLocation, shopLocation);
-        Double wGs84 = distanceMap.get("WGs84");
-        shopDetailVO.setDistance(wGs84);
+        if (shopDetailVO.getLongitude() != null && shopDetailVO.getLatitude() != null){
+            String shopLocation = String.format("%s,%s", shopDetailVO.getLongitude(), shopDetailVO.getLatitude());
+            String userLocation = String.format("%s,%s", longitude, latitude);
+            Map<String, Double> distanceMap = GeodesyUtil.getDistance(userLocation, shopLocation);
+            Double wGs84 = distanceMap.get("WGs84");
+            shopDetailVO.setDistance(wGs84);
+        }
         return shopDetailVO;
     }
 

--
Gitblit v1.7.1