Merge remote-tracking branch 'origin/sit' into sit

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -4107,7 +4107,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
 
         // 注意：需要将store_id转换为String类型，与后续containsKey判断保持一致
         avgScoreMap = storeEvaluationMapper.allStoreAvgScore().stream().collect(Collectors.groupingBy(o -> o.get("store_id").toString()));
-        commentMap = storeCommentMapper.selectList(new QueryWrapper<StoreComment>().eq("business_type", "5").eq("delete_flag", 0)).stream().collect(Collectors.groupingBy(StoreComment::getStoreId));
+        List<StoreComment> storeComments = storeCommentMapper.selectList(
+                new QueryWrapper<StoreComment>()
+                        .eq("business_type", "5")
+                        .eq("delete_flag", 0));
+        commentMap = storeComments.stream()
+                .filter(comment -> comment.getStoreId() != null) // 过滤无店铺ID的评论，避免 groupingBy NPE
+                .collect(Collectors.groupingBy(StoreComment::getStoreId));
 
 
         // 查询入口头图