From 80d34c5c3c15b4f0c032e773f08fd36dcf0ec8a6 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 25 Dec 2023 13:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/store/product/CloudWarehouse.php      | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php
index 4e899fab..c3fe0315 100644
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@@ -45,13 +45,15 @@ class CloudWarehouse extends BaseController
      */
     public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '')
     {
-        if($cate_pid!=0){
-            $cate_id=Db::name('store_category')->where('pid',$cate_pid)->where('is_show',1)->column('store_category_id');
-        }
         $cloud_product_arr = Db::name('cloud_product')
-            ->whereIn('cate_id', $cate_id)
             ->where('street_code', $street_code)
-            ->where(function($query){
+            ->where(function($query)use($cate_pid,$cate_id){
+                if($cate_pid!=0){
+                    $cate_id=Db::name('store_category')->where('pid',$cate_pid)->where('is_show',1)->column('store_category_id');
+                }
+                if($cate_id>0){
+                   $query ->whereIn('cate_id', $cate_id);
+                }
                 $query->whereOr('mer_labels', '')
                 ->whereOr('mer_labels',',5,');
             })
@@ -72,9 +74,15 @@ class CloudWarehouse extends BaseController
         if (!$cloud_product) {
             return app('json')->success(['count' => 0, 'list' => []]);
         }
-        $count = Db::name('cloud_product')->whereIn('cate_id', $cate_id)
+        $count = Db::name('cloud_product')
         ->where('street_code', $street_code)
-        ->where(function($query){
+        ->where(function($query) use($cate_pid,$cate_id){
+            if($cate_pid!=0){
+                $cate_id=Db::name('store_category')->where('pid',$cate_pid)->where('is_show',1)->column('store_category_id');
+            }
+            if($cate_id>0){
+               $query ->whereIn('cate_id', $cate_id);
+            }
             $query->whereOr('mer_labels', '')
             ->whereOr('mer_labels',',5,');
         })