From fc21ab0f288823a22a05b13d33f07362b5c6b91c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 13:13:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
index 1d9c8ad..e0665fb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
@@ -17,10 +18,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -43,15 +47,20 @@
@Resource
private TokenService tokenService;
+
+
+
@GetMapping("/goodsList")
@ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){
- List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).list();
+ List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0).eq(GoodsEvaluate::getStatus, 2).list();
for (GoodsEvaluate goodsEvaluate : list) {
AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId());
- goodsEvaluate.setUserName(appUserById.getName());
- goodsEvaluate.setAvatar(appUserById.getAvatar());
- goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
+ if(null != appUserById){
+ goodsEvaluate.setUserName(appUserById.getName());
+ goodsEvaluate.setAvatar(appUserById.getAvatar());
+ goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
+ }
}
return R.ok(list);
}
@@ -96,34 +105,62 @@
return R.ok();
}
+
+
/**
* 评论列表
*/
@GetMapping("/list")
@ApiOperation(value = "评论列表", tags = {"管理后台-商品管理-评价管理"})
- public R<List<GoodsEvaluate>> list(GoodsEvaluate goodsEvaluate){
- List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery()
- .like(StringUtils.isNotEmpty(goodsEvaluate.getGoodsName()),GoodsEvaluate::getGoodsName, goodsEvaluate.getComment())
- .like(StringUtils.isNotEmpty(goodsEvaluate.getUserName()),GoodsEvaluate::getUserName, goodsEvaluate.getUserName())
- .like(StringUtils.isNotEmpty(goodsEvaluate.getPhone()),GoodsEvaluate::getPhone, goodsEvaluate.getPhone())
- .eq(goodsEvaluate.getStatus()!=null,GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
- .orderByDesc(GoodsEvaluate::getCreateTime)
- .list();
+ public R<Page<GoodsEvaluate>> list(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ GoodsEvaluate goodsEvaluate){
+ List<Integer> goodsIds = new ArrayList<>();
+ List<Long> usersNameList = new ArrayList<>();
+ List<Long> usersPhoneList = new ArrayList<>();
- list.forEach(this::buildDetail);
+ if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+ goodsIds = goodsService.lambdaQuery()
+ .like(Goods::getName, goodsEvaluate.getGoodsName())
+ .list().stream().map(Goods::getId).collect(Collectors.toList());
+ if (goodsIds.isEmpty()) {
+ return R.ok(new Page<>());
+ }
+ }
+ if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+ usersNameList = appUserClient.getAppUserByName(goodsEvaluate.getUserName()).getData().stream().map(AppUser::getId).collect(Collectors.toList());
+ if (usersNameList.isEmpty()) {
+ return R.ok(new Page<>());
+ }
- return R.ok(list);
+ }
+ if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())) {
+ usersPhoneList = appUserClient.getAppUserByPhone(goodsEvaluate.getPhone()).getData().stream().map(AppUser::getId).collect(Collectors.toList());
+ if (usersPhoneList.isEmpty()) {
+ return R.ok(new Page<>());
+ }
+ }
+ usersNameList.retainAll(usersPhoneList);
+ Page<GoodsEvaluate> page = goodsEvaluateService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsEvaluate>()
+ .in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds)
+ .in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList)
+ .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
+ .orderByDesc(GoodsEvaluate::getCreateTime));
+
+
+ page.getRecords().forEach(this::buildDetail);
+
+ return R.ok(page);
}
private void buildDetail(GoodsEvaluate item) {
AppUser appUser = appUserClient.getAppUserById(item.getAppUserId());
- if (appUser == null){
- throw new RuntimeException("获取用户信息失败");
+ if (appUser != null){
+ item.setPhone(appUser.getPhone());
+ item.setUserName(appUser.getName());
}
Goods goods = goodsService.getById(item.getGoodsId());
item.setGoodsName(goods.getName());
- item.setPhone(appUser.getPhone());
- item.setUserName(appUser.getName());
}
/**
--
Gitblit v1.7.1