From 02cad626715b3b73904e8e04f41a5fb5adb0371b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 28 Jun 2024 15:49:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=E6=88=96=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=8A=B6=E6=80=81=E7=9A=84=E5=BA=93=E5=AD=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/user/UserLists.php | 2 +- .../user_product_storage/UserProductStorageLists.php | 1 + .../user_product_storage/UserProductStorageLogic.php | 8 ++++++-- .../user_product_storage/UserProductStorageController.php | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php index c80f7966f..2ce801a64 100644 --- a/app/admin/lists/user/UserLists.php +++ b/app/admin/lists/user/UserLists.php @@ -41,7 +41,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface $params = $this->params; $where = []; if(isset($params['nickname']) && $params['nickname'] != ''){ - $where[] = ['nickname','like','%'.$params['nickname'].'%']; + $where[] = ['real_name|nickname','like','%'.$params['nickname'].'%']; } if(isset($params['account']) && $params['account'] != ''){ $where[] = ['account','like','%'.$params['account'].'%']; diff --git a/app/admin/lists/user_product_storage/UserProductStorageLists.php b/app/admin/lists/user_product_storage/UserProductStorageLists.php index 8a8c7ffe9..25b60b617 100644 --- a/app/admin/lists/user_product_storage/UserProductStorageLists.php +++ b/app/admin/lists/user_product_storage/UserProductStorageLists.php @@ -45,6 +45,7 @@ class UserProductStorageLists extends BaseAdminDataLists implements ListsSearchI */ public function lists(): array { + $this->searchWhere[]=['status','=',1];//只显示正常状态的记录，不显示已出库完的记录 return UserProductStorage::where($this->searchWhere) ->field(['id', 'uid', 'oid', 'product_id', 'nums', 'status','create_time']) ->limit($this->limitOffset, $this->limitLength) diff --git a/app/common/logic/user_product_storage/UserProductStorageLogic.php b/app/common/logic/user_product_storage/UserProductStorageLogic.php index 4125c73c4..ed775d912 100644 --- a/app/common/logic/user_product_storage/UserProductStorageLogic.php +++ b/app/common/logic/user_product_storage/UserProductStorageLogic.php @@ -50,8 +50,12 @@ class UserProductStorageLogic extends BaseLogic self::setError('库存不足'); return false; } - $find->nums=bcsub($find['nums'],$v['nums']); - $find->saver(); + $nums=bcsub($find['nums'],$v['nums']); + $find->nums=$nums; + if($nums==0){ + $find->status=0; + } + $find->save(); $data_log[$k]['uid']=$uid; $data_log[$k]['oid']=$find['oid']; $data_log[$k]['product_id']=$find['product_id']; diff --git a/app/store/controller/user_product_storage/UserProductStorageController.php b/app/store/controller/user_product_storage/UserProductStorageController.php index 60b159433..d13a54e6a 100644 --- a/app/store/controller/user_product_storage/UserProductStorageController.php +++ b/app/store/controller/user_product_storage/UserProductStorageController.php @@ -36,7 +36,6 @@ class UserProductStorageController extends BaseAdminController $info=$params['info']; $uid=$params['uid']; $store_id=$this->adminInfo['store_id']; - d($params); UserProductStorageLogic::supply($info,$uid,$store_id); if(UserProductStorageLogic::hasError()){ return $this->fail(UserProductStorageLogic::getError());