From fc3dd371c6dcbafa375b158abf98dd63afdc244e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 18:23:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 6 +++++-
1 files changed, 5 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 fb99589..987abec 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,6 +5,7 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
+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;
@@ -16,6 +17,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -69,7 +71,9 @@
.eq(GoodsEvaluate::getStatus, 2)
.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