From 5cc14b3aec318b99ca8d58b21a9731033fbf61d0 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Sun, 27 Sep 2020 14:25:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE--=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Actions/Grid/v3/GoodsActivitySetting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Admin/Actions/Grid/v3/GoodsActivitySetting.php b/app/Admin/Actions/Grid/v3/GoodsActivitySetting.php index 056f227..6257a88 100644 --- a/app/Admin/Actions/Grid/v3/GoodsActivitySetting.php +++ b/app/Admin/Actions/Grid/v3/GoodsActivitySetting.php @@ -69,6 +69,6 @@ class GoodsActivitySetting extends AbstractTool */ protected function authorize($user): bool { - return $user->can('do-action'); + return $user->can('goods_activity_setting'); } } From cb69e18bf2db41b056ccad9b73a426a0dfd5fe08 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Sun, 27 Sep 2020 14:49:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81--?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BA=93=E5=AD=98=E5=92=8C=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/GoodsActivityController.php | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 23d78a1..6d06822 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -228,29 +228,35 @@ class GoodsActivityController extends AdminController })->default(1); $form->saving(function (Form $form){ $storeId = $form->input('store_id'); - // $marketIds = $form->input('market_ids'); $tags = $form->input('tags'); $spec = $form->input('spec'); $detailsImgs = $form->input('details_imgs'); $goodsCategoryId = $form->input('goods_category_id'); - + $expireTime = $form->input('expire_time'); + $isInfinite = $form->input('is_infinite'); + $inventory = $form->input('inventory'); $onSale = $form->input('on_sale'); - $expireTime = $form->model()->expire_time; - $OldInventory = $form->model()->inventory; - if(!empty($onSale) && $onSale == 1 && $expireTime <= time()){ - return $form->error('活动结束时间必须大于当前时间，请修改后再上架！'); - }else if(!empty($onSale) && $onSale == 1 && $OldInventory <= 0){ - return $form->error('库存必须为大于0的数字'); - } - $inventory = $form->input('inventory'); - // 规格 - if(!empty($inventory)){ + // 库存 + if(!empty($inventory) && empty($onSale)){ if(!is_numeric($inventory) || $inventory < 0){ return $form->error('库存必须为大于等于0的数字'); } } + $OldExpireTime = $form->model()->expire_time; + $OldInventory = $form->model()->inventory; + $OldIsInfinite = $form->model()->is_infinite; + + $expireTime = empty($expireTime)?$OldExpireTime:strtotime($expireTime); + $isInfinite = empty($isInfinite)?$OldIsInfinite:$isInfinite; + $inventory = empty($inventory)?$OldInventory:$inventory; + if(!empty($onSale) && $onSale == 1 && $expireTime <= time()){ + return $form->error('活动结束时间必须大于当前时间，请修改后再上架！'); + }else if(!empty($onSale) && $onSale == 1 && $inventory <= 0 && $isInfinite == 0){ + return $form->error('商品上架或者关闭无限库存时,库存必须为大于0的数字'); + } + if(!empty($storeId)){ // 商品所属市场，根据店铺查询市场 $info = StoreModel::getStoreInfo($storeId,'market_id'); @@ -258,18 +264,6 @@ class GoodsActivityController extends AdminController $form->market_ids = ["$info->market_id"]; } - // $marketIdsArr = []; - // if(!empty($marketIds)){ - // foreach($marketIds as $km => $marketId){ - // if(empty($marketId)){ - // unset($marketIds[$km]); - // continue; - // } - // $marketIdsArr[] = $marketId; - // } - // } - // $form->marketIds = json_encode($marketIdsArr); - $tagsArr = []; if(!empty($tags)){ foreach($tags as $kt => $tag){ From 4f267677e30523301cfefff943b2b1f731496d5b Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 28 Sep 2020 11:58:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/LanzuEmployeesController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 57db797..0612e5a 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -26,6 +26,8 @@ class LanzuEmployeesController extends AdminController //市场 $marketList = MarketModel::getMarketArray(); $positionList = config('role.position'); + //店铺 + $storeList = StoreModel::getStoreArray([['market_id','=',1]]); $grid->column('id')->sortable(); $grid->column('name'); @@ -34,9 +36,8 @@ class LanzuEmployeesController extends AdminController $grid->column('market_id')->display(function($marketId) use($marketList){ return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; }); - $grid->column('store_id')->display(function($storeId){ - $item = StoreModel::getStoreInfo($storeId,'name'); - return empty($item) ? '' : $item->name; + $grid->column('store_id')->display(function($storeId) use($storeList){ + return isset($storeList[$storeId]) ? $storeList[$storeId] : ''; }); $grid->column('position')->display(function($position) use($positionList){ @@ -50,9 +51,12 @@ class LanzuEmployeesController extends AdminController }); $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); - $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList){ + $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList,$storeList){ $filter->equal('id'); $filter->equal('market_id')->select($marketList); + $filter->equal('user_id'); + $filter->like('name'); + $filter->equal('store_id')->select($storeList); $filter->like('position')->select($positionList); }); $grid->model()->orderBy('status','desc');