店铺街添加商品状态过滤

app/api/logic/LocalStoreLogic.php

@@ -223,20 +223,26 @@ class LocalStoreLogic extends Logic
                 $query->where(['state' => 1, 'audit_status' => 1, 'delete_time' => 0])
                     ->withLimit(10);
             }])
-            ->withAttr('street_goods.url', function($v) {
-                return UrlServer::getFileUrl($v);
-            })
+
             ->leftJoin('local_store_goods lsg', 'lsg.lstore_id = ls.lstore_id')
-            ->where(['ls.is_delete' => 0, 'ls.store_state' => 1])
             ->where($where)
+            ->where(['ls.is_delete' => 0, 'ls.store_state' => 1])
             ->whereNotNull('ls.shopLogo')
-            ->field('ls.lstore_id as ls_id, ls.shopLogo, ls.shopName, ls.longitude, ls.latitude, ls.latitude, ls.address, ' . $distance_sql . ', lsg.lstore_id')
+            ->field('ls.lstore_id as ls_id, ls.shopLogo, ls.shopName, ls.longitude, ls.latitude, ls.latitude, ls.address, ' . $distance_sql . ', lsg.id, lsg.lstore_id')
             ->order($order)
             ->page($data['page_no'], $data['page_size'])
             ->group('ls.lstore_id')
             ->select()->toArray();
 
         foreach ($lists as $key => &$value) {
+            // 获取商品图片
+            if (isset($value['street_goods'])) {
+                foreach ($value['street_goods'] as $k1 => $v1) {
+                    $field = LocalStoreGoodsPic::where('lsg_id', $v1['id'])->field('url')->find();
+                    $value['street_goods'][$k1]['url'] = $field['url'];
+                }
+            }
+
             // 东龙汇超时价格 *88折
             if ($value['lstore_id'] == Config::get('localstore.dlh_lstore_id')) {
                 foreach ($value['street_goods'] as $k1 => &$v1) {

app/common/model/LocalStore.php

@@ -19,10 +19,7 @@ class LocalStore extends Model
     public function streetGoods()
     {
         return $this->hasMany(LocalStoreGoods::class, 'lstore_id', 'lstore_id')
-            ->alias('lsg')
-            ->where(['lsg.state' => 1, 'lsg.audit_status' => 1, 'lsg.delete_time' => 0])
-            ->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');
+            ->field('id, lstore_id, title, price')
+            ->order('id desc');
     }
 }