From d8fe88c1b0f193fc205dd9a764ca8c462937fcc6 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Fri, 9 Aug 2024 02:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95api=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BF=AB=E8=AE=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/IndexLogic.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php
index 988cc04e..8f2eeab8 100755
--- a/app/api/logic/IndexLogic.php
+++ b/app/api/logic/IndexLogic.php
@@ -21,6 +21,7 @@ use think\facade\Db;
 use app\common\model\activity_area\ActivityArea;
 use think\facade\Event;
 use app\common\model\MallNews;
+use app\common\model\MallNewsShop;
 
 
 class IndexLogic extends Logic
@@ -220,14 +221,21 @@ class IndexLogic extends Logic
         // 商城快讯
         $mall_news = MallNews::where('delete_time', 0)->order('sort desc, create_time desc')->limit(3)->select();
         foreach ($mall_news as &$v) {
-            if (isset($v['files'])) {
-                foreach ($v['files'] as &$v1) {
-                    if ($v['type'] == 0) {
-                        $v1['src'] = UrlServer::getFileUrl('uploads/images/' . $v1['src']);
-                    } else {
-                        $v1['src'] = Config::get('aliyunoss.domain') . self::$FILE_VIDEO_PATH . '/'. $v1['src'];
+            if ($v['mall_type'] == 0) {
+                if (isset($v['files'])) {
+                    foreach ($v['files'] as &$v1) {
+                        if ($v['type'] == 0) {
+                            $v1['src'] = UrlServer::getFileUrl('uploads/images/' . $v1['src']);
+                        } else {
+                            $v1['src'] = Config::get('aliyunoss.domain') . self::$FILE_VIDEO_PATH . '/'. $v1['src'];
+                        }
                     }
                 }
+            } else if ($v['mall_type'] == 1) {
+                $v['files'] = MallNewsShop::alias('mns')
+                    ->join('goods g', 'mns.shop_id = g.id')
+                    ->field('mns.id, g.id as gid, g.name')
+                    ->where(['mns.delete_time' => 0])->whereIn('mns.id', $v['mall_news_goods_id'])->select()->toArray();
             }
         }