Changes

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/entity/CityTrends.java

@@ -4,12 +4,15 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.cityComment.entity.CityComment;
 import org.jeecg.modules.cityShop.entity.CityShop;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -151,11 +154,13 @@ public class CityTrends implements Serializable {
     @ApiModelProperty(value = "关联店铺")
     private java.lang.String shopId;
 
-    @TableField(exist = false)
-	private CityShop shop;
-
     /**驳回备注*/
     @Excel(name = "驳回备注", width = 15)
     @ApiModelProperty(value = "驳回备注")
     private java.lang.String errText;
+
+    @TableField(exist = false)
+    private CityShop shop;
+    @TableField(exist = false)
+    private List<CityComment> comments;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -350,25 +350,22 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         Page<CityTrends> page = new Page<CityTrends>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityTrends> page1 = cityTrendsService
                 .lambdaQuery()
+                .eq(StringUtils.isNotBlank(classId), CityTrends::getClassId,classId)
                 .orderByDesc(CityTrends::getCreateTime)
                 .page(page);
 
-        if(StringUtils.isNotBlank(classId)){
-            page1 = cityTrendsService
-                    .lambdaQuery()
-                    .eq(CityTrends::getClassId,classId)
-                    .orderByDesc(CityTrends::getCreateTime)
-                    .page(page);
 
-
-        }
-        //获取评论数量
-        List<CityTrends> records = page1.getRecords();
-        //创建一个新的集合
-        List<CityTrends> newRecords = new ArrayList<>();
-        for (CityTrends cityTrends : records) {
+        for (CityTrends cityTrends : page1.getRecords()) {
             cityTrends.setIsComment(Math.toIntExact(cityCommentService.lambdaQuery().eq(CityComment::getOrderId, cityTrends.getId()).count()));
-            HanHaiMember one = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getId, cityTrends.getUserId()).one();
+            cityTrends.setComments(cityCommentService.lambdaQuery()
+                    .orderByDesc(CityComment::getCreateTime)
+                    .eq(CityComment::getOrderId, cityTrends.getId())
+                    .last("limit 3")
+                    .list());
+
+            HanHaiMember one = hanHaiMemberService.lambdaQuery()
+                    .eq(HanHaiMember::getId, cityTrends.getUserId()).one();
+
             if(StringUtils.isBlank(one.getName())){
                 cityTrends.setUserName(one.getNickName());
             }else{
@@ -390,16 +387,13 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             }
 
             //店铺信息
-            CityShop shop = cityShopService.lambdaQuery().eq(CityShop::getId, cityTrends.getShopId()).one();
-            if(shop!=null){
-                cityTrends.setShop(shop);
+            if(StringUtils.isNotBlank(cityTrends.getShopId())){
+                cityTrends.setShop(cityShopService.lambdaQuery().eq(CityShop::getId, cityTrends.getShopId()).one());
             }
-
-            newRecords.add(cityTrends);
         }
+
         //随机排序帖子列表数据，每次刷新展示的数据不同
-//        Collections.shuffle(newRecords);
-        page1.setRecords(newRecords);
+//        Collections.shuffle(page1.getRecords());
 
         return Result.OK(page1);
     }