From 5d0e203d98a01eb8bc4a9e76a06141038880e173 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 13 Dec 2024 10:50:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(store=5Fproduct):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E5=92=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整商品搜索条件，增加 product_type 的 in 搜索
- 移除 id 字段的 = 搜索
- 在商品详情中添加状态消息和仓库数量信息
---
 app/admin/lists/store_product/StoreProductLists.php | 3 ++-
 app/admin/logic/store_product/StoreProductLogic.php | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php
index 05f5972aa..f70e06b56 100644
--- a/app/admin/lists/store_product/StoreProductLists.php
+++ b/app/admin/lists/store_product/StoreProductLists.php
@@ -34,7 +34,8 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function setSearch(): array
     {
         return [
-            '=' => ['cate_id', 'is_show', 'bar_code','product_type','id'],
+            '=' => ['cate_id', 'is_show', 'bar_code','id'],
+            'in' => ['product_type'],
             '<=' => ['stock'],
             '%like%' => ['store_name'],
         ];
diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 8852b7a0d..6869b190c 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -16,6 +16,7 @@ use app\common\model\store_product_unit\StoreProductUnit;
 use app\common\model\system_store\SystemStore;
 use app\common\model\system_store_storage\SystemStoreStorage;
 use app\common\model\user\User;
+use app\common\model\warehouse_product_storege\WarehouseProductStorege;
 use Illuminate\Support\Facades\Log;
 use support\exception\BusinessException;
 use think\facade\Db;
@@ -314,6 +315,13 @@ class StoreProductLogic extends BaseLogic
                 $data = StoreProductGroupPrice::resetProductPrice($data, $userShip);
             }
         }
+        if($data['is_show']==1){
+            $data['status_msg']='上架|常用';
+        }else{
+            $data['status_msg']='下架|不常用|是否有替换';
+        }
+        $data['warehouse_nums']=WarehouseProductStorege::where('product_id', $params['id'])->where('warehouse_id',1)->value('nums')??0;
+
         return $data;
     }