From d54c412c3577ab4464b6e3f01fb4bf3eb02a72b7 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Mon, 21 Oct 2024 17:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E8=A1=97?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LocalStoreLogic.php | 12 +++++-------
 app/common/model/LocalStore.php   |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php
index 00e17ae7..65442435 100644
--- a/app/api/logic/LocalStoreLogic.php
+++ b/app/api/logic/LocalStoreLogic.php
@@ -228,9 +228,12 @@ class LocalStoreLogic extends Logic
         // 这里的Join只是为了配合with获取指定的字段
         $lists = LocalStore::alias('ls')
         ->with(['street_goods' => function ($query) use ($keyword) {
-            $query->where('title', 'like', "%{$keyword}%")
-                ->where(['state' => 1, 'audit_status' => 1, 'delete_time' => 0]);
+            $query->where(['state' => 1, 'audit_status' => 1, 'delete_time' => 0])
+                ->withLimit(10);
         }])
+        ->withAttr('street_goods.url', function($v) {
+            return UrlServer::getFileUrl($v);
+        })
         ->join('local_store_goods lsg', 'lsg.lstore_id = ls.lstore_id')
         ->where(['ls.is_delete' => 0, 'ls.store_state' => 1])
         ->whereNotNull('ls.shopLogo')
@@ -247,11 +250,6 @@ class LocalStoreLogic extends Logic
                 $lists[$key]['price'] = round($value['price'] * LocalStoreGoodsLogic::$sale, 2);
             }
 
-            // 获取商品下的商品图片
-            foreach ($value['street_goods'] as &$v) {
-                $v['url'] = UrlServer::getFileUrl($v['url']);
-            }
-
             if ($value['distance'] <= 0) {
                 $lists[$key]['distance'] = '<500m';
             } else {
diff --git a/app/common/model/LocalStore.php b/app/common/model/LocalStore.php
index f419ff05..970acfc5 100755
--- a/app/common/model/LocalStore.php
+++ b/app/common/model/LocalStore.php
@@ -22,7 +22,6 @@ class LocalStore extends Model
             ->alias('lsg')
             ->join('local_store_goods_pic p', 'lsg.id = p.lsg_id')
             ->field('lsg.id, lsg.lstore_id, lsg.title, lsg.price, p.url')
-            ->order('lsg.id desc')
-            ->limit(10);
+            ->order('lsg.id desc');
     }
 }
\ No newline at end of file