From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 5217eca..9a6fa18 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
@@ -8,6 +8,7 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.model.Order;
@@ -56,10 +57,12 @@
@GetMapping("/goodsList")
@ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
- public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){
- List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0)
- .eq(GoodsEvaluate::getStatus, 2).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "").orderByDesc(GoodsEvaluate::getCreateTime).list();
- for (GoodsEvaluate goodsEvaluate : list) {
+ public R<PageInfo<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId, Integer pageNum, Integer pageSize){
+ PageInfo<GoodsEvaluate> pageInfo = new PageInfo<>(pageNum, pageSize);
+ PageInfo<GoodsEvaluate> page = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0)
+ .eq(GoodsEvaluate::getStatus, 2).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "")
+ .orderByDesc(GoodsEvaluate::getCreateTime).page(pageInfo);
+ for (GoodsEvaluate goodsEvaluate : page.getRecords()) {
AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId());
if(null != appUserById){
goodsEvaluate.setUserName(appUserById.getName());
@@ -67,7 +70,7 @@
goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
}
}
- return R.ok(list);
+ return R.ok(page);
}
/**
@@ -131,7 +134,7 @@
List<Long> usersNameList = new ArrayList<>();
List<Long> usersPhoneList = new ArrayList<>();
- if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+ if (StringUtils.isNotEmpty(goodsEvaluate.getGoodsName())) {
goodsIds = goodsService.lambdaQuery()
.like(Goods::getName, goodsEvaluate.getGoodsName())
.list().stream().map(Goods::getId).collect(Collectors.toList());
@@ -152,7 +155,13 @@
return R.ok(new Page<>());
}
}
- usersNameList.retainAll(usersPhoneList);
+ if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){
+ // 取交集
+ usersNameList.retainAll(usersPhoneList);
+ if (usersNameList.isEmpty())usersNameList.add(-1L);
+ }else{
+ usersNameList.addAll(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)
--
Gitblit v1.7.1