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 | 115 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 27 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 b1153e2..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
@@ -3,11 +3,15 @@
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;
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;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsEvaluate;
import com.ruoyi.other.service.GoodsEvaluateService;
@@ -17,10 +21,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>
@@ -42,18 +49,28 @@
private GoodsService goodsService;
@Resource
private TokenService tokenService;
+ @Resource
+ private OrderClient orderClient;
+
+
+
@GetMapping("/goodsList")
@ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
- public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){
- List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).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());
- 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);
+ return R.ok(page);
}
/**
@@ -76,6 +93,7 @@
List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
.eq(GoodsEvaluate::getStatus, 2)
.eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
+ .eq(GoodsEvaluate::getDelFlag, 0)
.eq(GoodsEvaluate::getOrderId, orderId));
for (GoodsEvaluate goodsEvaluate : list) {
Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
@@ -90,47 +108,90 @@
* 删除评论
*/
@DeleteMapping("/delete/{id}")
- @ApiOperation(value = "商品管理-评价管理-删除评论-删除评论", tags = {"管理后台"})
+ @ApiOperation(value = "删除评论", tags = {"管理后台-商品管理-评价管理"})
public R<Void> delete(@PathVariable("id") Long id){
- goodsEvaluateService.removeById(id);
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+ goodsEvaluate.setDelFlag(1);
+ goodsEvaluateService.updateById(goodsEvaluate);
+ //修改订单为待评价
+ Order data = orderClient.getOrderById(goodsEvaluate.getOrderId()).getData();
+ data.setOrderStatus(data.getOldOrderStatus());
+ orderClient.editOrder(data);
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();
+ @ApiOperation(value = "评论列表", tags = {"管理后台-商品管理-评价管理"})
+ 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.getGoodsName())) {
+ 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<>());
+ }
+ }
+ 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)
+ .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
+ .eq(GoodsEvaluate::getDelFlag, 0)
+ .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());
+ if(null != goods){
+ item.setGoodsName(goods.getName());
+ }
}
/**
* 评论详情
*/
@GetMapping("/{id}")
- @ApiOperation(value = "商品管理-评价管理-评论详情", tags = {"管理后台"})
+ @ApiOperation(value = "评论详情", tags = {"管理后台-商品管理-评价管理"})
public R<GoodsEvaluate> getDetail(@PathVariable("id") Long id){
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
buildDetail(goodsEvaluate);
@@ -141,7 +202,7 @@
* 评论上/下架
*/
@PutMapping("/changeStatus")
- @ApiOperation(value = "商品管理-评价管理-评论上/下架", tags = {"管理后台"})
+ @ApiOperation(value = "上/下架", tags = {"管理后台-商品管理-评价管理"})
public R<Void> changeStatus(@RequestBody GoodsEvaluate goodsEvaluate){
goodsEvaluateService.update(new LambdaUpdateWrapper<GoodsEvaluate>()
.eq(GoodsEvaluate::getId, goodsEvaluate.getId())
--
Gitblit v1.7.1