From f500373f520b86e9954b1f6e5b6fd68d97253dba Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 8 Jun 2023 11:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=88=9B=E5=BB=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/product/ProductDao.php     | 2 +-
 app/controller/admin/store/StoreProduct.php     | 2 ++
 app/controller/api/store/product/StoreMicro.php | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/common/dao/store/product/ProductDao.php b/app/common/dao/store/product/ProductDao.php
index 34f53869..919c6465 100644
--- a/app/common/dao/store/product/ProductDao.php
+++ b/app/common/dao/store/product/ProductDao.php
@@ -124,7 +124,7 @@ class ProductDao extends BaseDao
             });
         }
         $query->withSearch($keyArray, $whereArr)
-            ->Join('StoreSpu U', 'Product.product_id = U.product_id')->where('U.product_type', $where['product_type'] ?? 0)
+            ->Join('StoreSpu U', 'Product.product_id = U.product_id')
             ->when(($merId !== null), function ($query) use ($merId) {
                 $query->where('Product.mer_id', $merId);
             })
diff --git a/app/controller/admin/store/StoreProduct.php b/app/controller/admin/store/StoreProduct.php
index c98142ff..f5eaf6a3 100644
--- a/app/controller/admin/store/StoreProduct.php
+++ b/app/controller/admin/store/StoreProduct.php
@@ -54,6 +54,8 @@ class StoreProduct extends BaseController
         $merId = $mer_id ? $mer_id : null;
         $where['is_gift_bag'] = 0;
         $_where = $this->repository->switchType($where['type'], null,0);
+        unset($_where['product_type']);
+        $_where[] = ['product_type', 'in', [0, 98]];
         unset($_where['star']);
         $where = array_merge($where, $_where);
         return app('json')->success($this->repository->getAdminList($merId, $where, $page, $limit));
diff --git a/app/controller/api/store/product/StoreMicro.php b/app/controller/api/store/product/StoreMicro.php
index d89e915e..5c06662e 100644
--- a/app/controller/api/store/product/StoreMicro.php
+++ b/app/controller/api/store/product/StoreMicro.php
@@ -77,8 +77,10 @@ class StoreMicro extends BaseController
             $find['status']=1;
             $find['mer_status']=1;
             $find['old_product_id']=$product_id;
+            $find['slider_image']=explode(',',$find['slider_image']);
             unset($find['product_id'],$find['create_time']);
         }
+        /** @var ProductRepository $make */
         $make = app()->make(ProductRepository::class);
         $a=$make->create($find,0);
         if($a){