评论评价,团购bug修改

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -178,4 +178,6 @@ public class StoreInfoVo extends StoreInfo {
 
     private String storeClockInCount;
 
+    private String commitCount;
+
 }

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

@@ -393,6 +393,7 @@ public class StoreCommentServiceImpl extends ServiceImpl<StoreCommentMapper, Sto
             });
         }
         map.put("commitCount", count.toString());
+        map.put("img", storeCommentVoList.stream().map(StoreCommentVo::getUserImage).limit(6).collect(Collectors.joining(",")));
         if (sumScore == 0 || storeCommentVoList.isEmpty()) {
             map.put("score", "0");
         } else {

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

@@ -35,6 +35,7 @@ import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.config.GaoDeMapUtil;
 import shop.alien.store.service.NearMeService;
 import shop.alien.store.service.StoreClockInService;
+import shop.alien.store.service.StoreCommentService;
 import shop.alien.store.service.StoreInfoService;
 import shop.alien.store.util.FileUploadUtil;
 import shop.alien.store.util.GroupConstant;
@@ -117,6 +118,8 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
 
     private final StoreClockInService storeClockInService;
 
+    private final StoreCommentService storeCommentService;
+
     private final AliOSSUtil aliOSSUtil;
 
     @Value("${spring.web.resources.excel-path}")
@@ -994,10 +997,15 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         }
 
         // 店铺平均分
-        Map<Object, List<Map<String, Object>>> avgScoreMap = storeEvaluationMapper.allStoreAvgScore().stream().collect(Collectors.groupingBy(o -> o.get("store_id")));
+        /*Map<Object, List<Map<String, Object>>> avgScoreMap = storeEvaluationMapper.allStoreAvgScore().stream().collect(Collectors.groupingBy(o -> o.get("store_id")));
         if (avgScoreMap.containsKey(String.valueOf(result.getId()))) {
             result.setScore(Double.parseDouble(avgScoreMap.get(String.valueOf(result.getId())).get(0).get("avg_score").toString()));
-        }
+        }*/
+
+        Map<String, String> commitCountAndScore = storeCommentService.getCommitCountAndScore(null, 5, Integer.parseInt(storeId), null, null);
+        result.setScore(Double.parseDouble(commitCountAndScore.get("score")));
+        result.setCommitCount(commitCountAndScore.get("commitCount"));
+
 
         // 在该店铺的打卡次数
         result.setClockInStoreNum(clockStoreList.size());