|
@@ -5,11 +5,11 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import lombok.extern.flogger.Flogger;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.poi.util.StringUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import shop.alien.entity.second.vo.SecondCommentVo;
|
|
|
import shop.alien.entity.second.vo.SecondGoodsRecommendVo;
|
|
|
import shop.alien.entity.store.LifeFans;
|
|
|
import shop.alien.entity.store.StoreComment;
|
|
@@ -93,7 +93,7 @@ public class SecondRecommendServiceImpl extends ServiceImpl<SecondRecommendMappe
|
|
|
if (CollectionUtil.isEmpty(idList)) {
|
|
|
return list;
|
|
|
}
|
|
|
- List<StoreComment> commentList =mapper.querySecondCommentInfo(idList);
|
|
|
+ List<SecondCommentVo> commentList =mapper.querySecondCommentInfo(idList);
|
|
|
list.getRecords().forEach(item -> {
|
|
|
// 距离拼接
|
|
|
if (StringUtil.isNotBlank(item.getDist())) {
|
|
@@ -101,7 +101,7 @@ public class SecondRecommendServiceImpl extends ServiceImpl<SecondRecommendMappe
|
|
|
}
|
|
|
|
|
|
// 评论列表
|
|
|
- List<StoreComment> cList = new ArrayList<>();
|
|
|
+ List<SecondCommentVo> cList = new ArrayList<>();
|
|
|
commentList.forEach(comment -> {
|
|
|
if (item.getId() == comment.getBusinessId()) {
|
|
|
cList.add(comment);
|
|
@@ -125,7 +125,7 @@ public class SecondRecommendServiceImpl extends ServiceImpl<SecondRecommendMappe
|
|
|
* @return 关注列表
|
|
|
*/
|
|
|
public IPage<SecondGoodsRecommendVo> querySecondNewGoodsByPage(
|
|
|
- IPage<SecondGoodsRecommendVo> page, String position) throws Exception{
|
|
|
+ IPage<SecondGoodsRecommendVo> page, String position) throws Exception {
|
|
|
try {
|
|
|
JSONObject data = JwtUtil.getCurrentUserInfo();
|
|
|
String phoneId = null;
|
|
@@ -144,7 +144,7 @@ public class SecondRecommendServiceImpl extends ServiceImpl<SecondRecommendMappe
|
|
|
if (CollectionUtil.isEmpty(idList)) {
|
|
|
return list;
|
|
|
}
|
|
|
- List<StoreComment> commentList = mapper.querySecondCommentInfo(idList);
|
|
|
+ List<SecondCommentVo> commentList = mapper.querySecondCommentInfo(idList);
|
|
|
list.getRecords().forEach(item -> {
|
|
|
// 距离拼接
|
|
|
if (StringUtil.isNotBlank(item.getDist())) {
|
|
@@ -152,7 +152,7 @@ public class SecondRecommendServiceImpl extends ServiceImpl<SecondRecommendMappe
|
|
|
}
|
|
|
|
|
|
// 评论列表
|
|
|
- List<StoreComment> cList = new ArrayList<>();
|
|
|
+ List<SecondCommentVo> cList = new ArrayList<>();
|
|
|
commentList.forEach(comment -> {
|
|
|
if (item.getId() == comment.getBusinessId()) {
|
|
|
cList.add(comment);
|