From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 c5f851b..41a9c34 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
@@ -1,14 +1,22 @@
package com.ruoyi.other.service.impl;
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;
import com.ruoyi.other.vo.NearbyShopVO;
+import com.ruoyi.other.vo.ShopDetailVO;
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>
@@ -27,4 +35,22 @@
public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
return shopMapper.selectNearbyShopList(longitude,latitude);
}
+
+ @Override
+ public ShopDetailVO getShopDetail(Integer shopId, String longitude, String latitude) {
+ // 查询店铺详情
+ ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
+ if (shopDetailVO == null) {
+ throw new ServiceException("查询店铺不存在");
+ }
+
+ // 计算距离
+ 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