From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 29 十一月 2024 16:37:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 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 1313a27..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,10 +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> @@ -16,5 +28,29 @@ */ @Service public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService { + @Resource + private ShopMapper shopMapper; + + @Override + 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