From 2c249b86e922aef7397dc496fe5bbd84730b0772 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 18:35:04 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 15 +++++++++------
1 files changed, 9 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..32febc1 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
@@ -11,6 +11,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,7 @@
}
@Override
- public ShopDetailVO getShopDetail(Integer shopId, String longitude, String latitude) {
+ public ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude) {
// 查询店铺详情
ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
if (shopDetailVO == null) {
@@ -41,11 +42,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.toString(), latitude.toString());
+ Map<String, Double> distanceMap = GeodesyUtil.getDistance(userLocation, shopLocation);
+ Double wGs84 = distanceMap.get("WGS84");
+ shopDetailVO.setDistance(wGs84);
+ }
return shopDetailVO;
}
--
Gitblit v1.7.1