From 5c6b1469792343d30781074c18880259498109b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 18:11:37 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 80dc58a..1889c68 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -173,18 +173,20 @@
                     .in(Shop::getDelFlag, 0));
             goodsVO.setShopList(shopList);
         }
-        List<Shop> shopList = goodsVO.getShopList();
-        for (Shop shop : shopList) {
-            Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
-            shop.setDistance(wgs84);
-        }
-        shopList.sort(new Comparator<Shop>() {
-            @Override
-            public int compare(Shop o1, Shop o2) {
-                return o1.getDistance().compareTo(o2.getDistance());
+        if(StringUtils.isNotEmpty(longitude) && StringUtils.isNotEmpty(latitude)){
+            List<Shop> shopList = goodsVO.getShopList();
+            for (Shop shop : shopList) {
+                Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+                shop.setDistance(wgs84);
             }
-        });
-        goodsVO.setShopList(shopList);
+            shopList.sort(new Comparator<Shop>() {
+                @Override
+                public int compare(Shop o1, Shop o2) {
+                    return o1.getDistance().compareTo(o2.getDistance());
+                }
+            });
+            goodsVO.setShopList(shopList);
+        }
         Integer integer = orderClient.getGoodsSaleNum(goods.getId(), 1).getData();
         goodsVO.setSaleNum(integer);
         return goodsVO;

--
Gitblit v1.7.1