From 65b4ac3669144e582f0d96a18b32b3cf05074c71 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 27 Sep 2023 14:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/product/SpuRepository.php | 1 +
 app/controller/api/Common.php                           | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php
index 4a1fa59b..d3445bf7 100644
--- a/app/common/repositories/store/product/SpuRepository.php
+++ b/app/common/repositories/store/product/SpuRepository.php
@@ -187,6 +187,7 @@ class SpuRepository extends BaseRepository
                 foreach ($productIds as $productId) {
                     $RedisCacheService->SADD($dataKey, $productId);
                 }
+                //halt($productIds);
             }
             $where['product_id'] = $this->getSpuFromCache($where['mer_id'], $page, $limit);
             unset($where['mer_id'], $where['page']);
diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php
index 5cf487d0..951f9fcc 100644
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@@ -497,6 +497,7 @@ class Common extends BaseController
     public function get_cloud_shop($street_code){
         //更新查询镇级供应链店铺
         $typeTownSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownSupplyChain'])->value('mer_type_id');
+        /*
         $find=DB::name('merchant')
             ->alias('m')
             ->where('m.type_id',$typeTownSupplyChainId)
@@ -505,6 +506,10 @@ class Common extends BaseController
             ->where('m.street_id',$street_code)
             ->join('merchant_category c','m.category_id=c.merchant_category_id')
             ->field('m.mer_id,category_id,category_name,c.background,c.cover,c.description')->select();
+        */
+        $find=DB::name('merchant_category')
+            ->where('cover', '<>' ,'')
+            ->field('merchant_category_id as category_id,category_name,background,cover,description')->select();
         return app('json')->success($find??[]);
     }
 }