From 85384328c12fcc689e1f66f4deca77168859882d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 一月 2025 19:12:39 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 425f8b3..9991212 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
@@ -115,6 +115,7 @@
         }
 
         Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
+        AppUser finalAppUser1 = appUser;
         nearbyShopVOS.forEach(nearbyShopVO -> {
             List<ShopScore> scores = shopScoreMap.get(nearbyShopVO.getId());
             if (scores != null && !scores.isEmpty()){
@@ -123,6 +124,11 @@
                         .reduce(BigDecimal.ZERO, BigDecimal::add)
                         .divide(new BigDecimal(scores.size()), 1, RoundingMode.HALF_UP);
                 nearbyShopVO.setScore(score.toString());
+                nearbyShopVO.setMyScore("0");
+                if(null != finalAppUser1){
+                    ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, finalAppUser1.getId()).eq(ShopScore::getShopId, nearbyShopVO.getId()).last(" order by create_time desc limit 0, 1"));
+                    nearbyShopVO.setMyScore(null == one ? "0" : one.getScore().toString());
+                }
             }
         });
         return nearbyShopVOS;
@@ -137,7 +143,7 @@
             throw new ServiceException("查询店铺不存在");
         }
         ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shopId).last(" order by create_time desc limit 0, 1"));
-        shopDetailVO.setScore(null == one ? BigDecimal.ZERO : one.getScore());
+        shopDetailVO.setMyScore(null == one ? BigDecimal.ZERO : one.getScore());
         // 计算距离
         if (shopDetailVO.getLongitude() != null && shopDetailVO.getLatitude() != null){
             String shopLocation = String.format("%s,%s", shopDetailVO.getLongitude(), shopDetailVO.getLatitude());

--
Gitblit v1.7.1