From 097ca47c074edfd71211bf539bab86a74e9ca0c3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 13:34:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=B0=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/store_product/StoreProductLists.php | 2 +- app/admin/logic/store_product/StoreProductLogic.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index 7c0c9836e..8d2d6969b 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -46,7 +46,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa public function lists(): array { return StoreProduct::where($this->searchWhere) - ->field(['id', 'image', 'store_name','swap', 'cate_id', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) + ->field(['id', 'image', 'store_name','swap', 'cate_id','batch', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index e88207b5f..3ca4152de 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -49,6 +49,7 @@ class StoreProductLogic extends BaseLogic 'rose' => $params['rose'], 'is_return' => $params['is_return'], 'swap' => $params['swap']??0, + 'batch' => $params['batch']??0, ]; // if ($params['rose'] > 0) { // $rose_price = bcmul($params['cost'], $params['rose'], 2); @@ -120,6 +121,7 @@ class StoreProductLogic extends BaseLogic 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['cost'], + 'batch' => $params['batch'], 'swap' => $params['swap']??0, ];