From cbe0db51ecb248899ebe9278c78192460e067956 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 6 Jun 2025 09:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cook/domain/CookEvaluaPicture.java   |  5 ++-
 .../impl/CookEvaluaOrderServiceImpl.java      | 31 +++++++++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaPicture.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaPicture.java
index 270bccb..55e81ad 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaPicture.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaPicture.java
@@ -1,5 +1,6 @@
 package com.bonus.canteen.core.cook.domain;
 
+import com.bonus.canteen.core.common.utils.FileUrlUtil;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,5 +33,7 @@ public class CookEvaluaPicture extends BaseEntity {
     @ApiModelProperty(value = "图片路径")
     private String imgUrl;
 
-
+    public String getImgUrl() {
+        return FileUrlUtil.getFileUrl(this.imgUrl);
+    }
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java
index f7a14ef..04698bb 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java
@@ -58,15 +58,15 @@ public class CookEvaluaOrderServiceImpl implements ICookEvaluaOrderService {
         CookEvaluaOrderVo cookEvaluaOrderVo = new CookEvaluaOrderVo();
         BeanUtils.copyProperties(cookEvaluaOrder, cookEvaluaOrderVo);
 
-        CookEvaluaDetail menuEvaluaDetail = new CookEvaluaDetail();
-        menuEvaluaDetail.setEvaluaId(cookEvaluaOrder.getEvaluaId());
-        List<CookEvaluaDetail> menuEvaluaDetails = cookEvaluaDetailMapper.selectCookEvaluaDetailList(menuEvaluaDetail);
-        cookEvaluaOrderVo.setDetailList(menuEvaluaDetails);
+        CookEvaluaDetail cookEvaluaDetail = new CookEvaluaDetail();
+        cookEvaluaDetail.setEvaluaId(cookEvaluaOrder.getEvaluaId());
+        List<CookEvaluaDetail> cookEvaluaDetails = cookEvaluaDetailMapper.selectCookEvaluaDetailList(cookEvaluaDetail);
+        cookEvaluaOrderVo.setDetailList(cookEvaluaDetails);
 
-        CookEvaluaPicture menuEvaluaPicture = new CookEvaluaPicture();
-        menuEvaluaPicture.setEvaluaId(cookEvaluaOrder.getEvaluaId());
-        List<CookEvaluaPicture> menuEvaluaPictures = cookEvaluaPictureMapper.selectCookEvaluaPictureList(menuEvaluaPicture);
-        List<String> pictures = menuEvaluaPictures.stream().map(CookEvaluaPicture::getImgUrl).collect(Collectors.toList());
+        CookEvaluaPicture cookEvaluaPicture = new CookEvaluaPicture();
+        cookEvaluaPicture.setEvaluaId(cookEvaluaOrder.getEvaluaId());
+        List<CookEvaluaPicture> cookEvaluaPictures = cookEvaluaPictureMapper.selectCookEvaluaPictureList(cookEvaluaPicture);
+        List<String> pictures = cookEvaluaPictures.stream().map(CookEvaluaPicture::getImgUrl).collect(Collectors.toList());
         cookEvaluaOrderVo.setPictureList(pictures);
 
         return cookEvaluaOrderVo;
@@ -80,7 +80,20 @@ public class CookEvaluaOrderServiceImpl implements ICookEvaluaOrderService {
      */
     @Override
     public List<CookEvaluaOrder> selectCookEvaluaOrderList(CookEvaluaOrder cookEvaluaOrder) {
-        return cookEvaluaOrderMapper.selectCookEvaluaOrderList(cookEvaluaOrder);
+        List<CookEvaluaOrder> list = cookEvaluaOrderMapper.selectCookEvaluaOrderList(cookEvaluaOrder);
+        for (CookEvaluaOrder evaluaOrder : list) {
+            CookEvaluaDetail cookEvaluaDetail = new CookEvaluaDetail();
+            cookEvaluaDetail.setEvaluaId(cookEvaluaOrder.getEvaluaId());
+            List<CookEvaluaDetail> cookEvaluaDetails = cookEvaluaDetailMapper.selectCookEvaluaDetailList(cookEvaluaDetail);
+            evaluaOrder.setDetailList(cookEvaluaDetails);
+
+            CookEvaluaPicture cookEvaluaPicture = new CookEvaluaPicture();
+            cookEvaluaPicture.setEvaluaId(cookEvaluaOrder.getEvaluaId());
+            List<CookEvaluaPicture> menuEvaluaPictures = cookEvaluaPictureMapper.selectCookEvaluaPictureList(cookEvaluaPicture);
+            List<String> pictures = menuEvaluaPictures.stream().map(CookEvaluaPicture::getImgUrl).collect(Collectors.toList());
+            evaluaOrder.setPictureList(pictures);
+        }
+        return list;
     }
 
     /**