From 5c8042515e1894e924c09aeab2d8c556b229c5a3 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期二, 10 十二月 2024 17:44:16 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 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 273c58b..64c2bd0 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 @@ -5,10 +5,13 @@ 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.security.service.TokenService; +import com.ruoyi.other.api.domain.Goods; import com.ruoyi.other.api.domain.GoodsEvaluate; import com.ruoyi.other.service.GoodsEvaluateService; import com.ruoyi.other.service.GoodsService; import com.ruoyi.other.vo.GoodsEvaluateVO; +import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -16,6 +19,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -35,6 +39,8 @@ private AppUserClient appUserClient; @Resource private GoodsService goodsService; + @Resource + private TokenService tokenService; @GetMapping("/goodsList") @ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"}) @@ -44,6 +50,7 @@ AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId()); goodsEvaluate.setUserName(appUserById.getName()); goodsEvaluate.setAvatar(appUserById.getAvatar()); + goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId())); } return R.ok(list); } @@ -64,11 +71,15 @@ @GetMapping("/detail/{orderId}") @ApiOperation(value = "评论详情", tags = {"小程序-评论详情"}) public R<List<GoodsEvaluate>> detail(@PathVariable("orderId") Long orderId){ + LoginUser loginUserApplet = tokenService.getLoginUserApplet(); List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>() .eq(GoodsEvaluate::getStatus, 2) + .eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid()) .eq(GoodsEvaluate::getOrderId, orderId)); for (GoodsEvaluate goodsEvaluate : list) { - + Goods goods = goodsService.getById(goodsEvaluate.getGoodsId()); + goodsEvaluate.setGoodsName(goods.getName()); + goodsEvaluate.setGoodsImg(goods.getHomePagePicture()); } return R.ok(list); } -- Gitblit v1.7.1