From bdec3f410eddecb3a2327853443616cc3d2465a9 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 12 Feb 2025 14:47:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Product.php | 6 +++---
 app/admin/model/v1/ProductModel.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/controller/v1/Product.php b/app/admin/controller/v1/Product.php
index 1326bc78..9644b012 100644
--- a/app/admin/controller/v1/Product.php
+++ b/app/admin/controller/v1/Product.php
@@ -18,7 +18,7 @@ class Product
             'spu',
             'category_id',
             'created_at',
-            'is_sale',
+            'is_show',
             'page/d' => 1, 
             'size/d' => 10
         ]);
@@ -48,10 +48,10 @@ class Product
             ->withSearch(['name_nullable', 'spu_nullable', 'created_at_nullable'], [
                 'name_nullable'       => $param['name']??null,
                 'spu_nullable'        => $param['spu']??null,
-                'created_at_nullable' => $param['created_at']??null,
+                'created_at_nullable' => !empty($param['created_at']) ? explode(',', $param['created_at']) : null,
             ])
             ->categoryNullable($param['category_id']??null)
-            ->isSaleNullable(isset($param['is_sale']) ? (bool)$param['is_sale'] : null)
+            ->isShowNullable(isset($param['is_show']) ? (bool)$param['is_show'] : null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
diff --git a/app/admin/model/v1/ProductModel.php b/app/admin/model/v1/ProductModel.php
index e0aa1ee6..d6ef2410 100644
--- a/app/admin/model/v1/ProductModel.php
+++ b/app/admin/model/v1/ProductModel.php
@@ -71,11 +71,11 @@ class ProductModel extends ProductBaseModel
     }
 
     // 上架状态查询
-    public function scopeIsSaleNullable($query, bool|null $value)
+    public function scopeIsShowNullable($query, bool|null $value)
     {
         if (is_null($value)) {
             return;
         }
-        $query->where('is_sale', '=', (int)$value);
+        $query->where('is_show', '=', (int)$value);
     }
 }