From 7381ec7d40d699cd57d5b82f779577e662f95c8d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 10:34:31 +0800
Subject: [PATCH] 12.9
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 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 38fcdf3..de346ca 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
@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -36,10 +37,18 @@
private ShopScoreService shopScoreService;
@Override
- public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
- List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, latitude);
+ public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
+ List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, longitude);
+ if (nearbyShopVOS == null || nearbyShopVOS.isEmpty()) {
+ return Collections.emptyList();
+ }
+
List<Long> shopIds = nearbyShopVOS.stream().map(NearbyShopVO::getId).collect(Collectors.toList());
List<ShopScore> shopScores = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().in(ShopScore::getShopId, shopIds));
+ if (shopScores == null || shopScores.isEmpty()) {
+ return nearbyShopVOS;
+ }
+
Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
nearbyShopVOS.forEach(nearbyShopVO -> {
@@ -74,9 +83,6 @@
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