From 66dfcfc0e50ef74ea7f0751d3ecbbfecae33c0fb Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 10:15:06 +0800
Subject: [PATCH] 1.完成开发门店打分接口
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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..f3a5c1a 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,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Collections;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
-import java.util.NoSuchElementException;
/**
* <p>
@@ -37,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) {
@@ -45,12 +42,19 @@
}
// 计算距离
- 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;
}
+ public static void main(String[] args) {
+ String userLocation = String.format("%s,%s", "106.6664549", "29.4158471");
+ System.out.println(userLocation);
+ }
+
}
--
Gitblit v1.7.1