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

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 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 41a9c34..a7873da 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
@@ -3,8 +3,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.GeodesyUtil;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.mapper.GoodsMapper;
 import com.ruoyi.other.mapper.ShopMapper;
 import com.ruoyi.other.api.domain.Shop;
 import com.ruoyi.other.service.ShopService;
@@ -13,10 +11,8 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 
 /**
  * <p>
@@ -45,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