puzhibing
2024-12-04 5fee7383dbf17f62f0ec3b26a538fbef9b70eede
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,8 @@
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>
@@ -33,7 +29,7 @@
    @Override
    public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
        return shopMapper.selectNearbyShopList(longitude,latitude);
        return shopMapper.selectNearbyShopList(longitude,latitude);
    }
    @Override
@@ -45,11 +41,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, latitude);
            Map<String, Double> distanceMap = GeodesyUtil.getDistance(userLocation, shopLocation);
            Double wGs84 = distanceMap.get("WGs84");
            shopDetailVO.setDistance(wGs84);
        }
        return shopDetailVO;
    }