From 6206979be11dfab662994792ab79f15577afbbf2 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 10:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B4=97=E5=95=86=E5=93=81--?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=A7=84=E6=A0=BC=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E6=9C=8D=E5=8A=A1=E7=AB=99=E4=B8=93=E5=91=98--?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=87=92ID=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/GoodsNewController.php | 12 ++++++ .../v3/ServicePersonnelController.php | 38 ++++++++++++++----- app/Admin/Controllers/v3/UserController.php | 6 ++- app/Console/Commands/MigrateGoods.php | 2 +- resources/lang/zh-CN/service-personnel.php | 2 +- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 5d87537..e143e88 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -41,6 +41,16 @@ class GoodsNewController extends AdminController $grid->name->editable(); $grid->price->editable(); $grid->column('goods_unit','单位')->editable(); + $grid->column('spec','规格')->display(function($spec){ + $item = ''; + if(!empty($spec)){ + foreach($spec as $key => $value){ + $item .= $value['spec_key'].'：'.$value['spec_value'].'
'; + } + } + + return $item; + }); $grid->column('market_id')->display(function($marketId){ $item = MarketModel::getMarketInfo($marketId,'name'); return empty($item) ? '' : $item->name; @@ -66,12 +76,14 @@ class GoodsNewController extends AdminController $grid->actions([new GoodsNewCopy(),new GoodsNewImage()]); $grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){ + $filter->equal('id'); $filter->like('name'); $filter->equal('store_id')->select($storeList); $filter->equal('category_id')->select($categoryList); $filter->equal('goods_category_id')->select($goodsCategoryList); $filter->equal('market_id')->select($marketList); $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); + $filter->equal('price'); }); $grid->model()->orderBy('category_id', 'asc'); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index e641621..2f0f81f 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -103,14 +103,14 @@ class ServicePersonnelController extends AdminController //市场 $marketList = MarketModel::getMarketArray(); // 用户 - $userList = UserModel::getUserArray(); + // $userList = UserModel::getUserArray(); // 已绑定的用户 - $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); - foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ - unset($userList[$ku]); - } - } + // $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); + // foreach($userList as $ku => $uv){ + // if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ + // unset($userList[$ku]); + // } + // } $form->column(6,function(Form $form){ $form->hidden('id'); @@ -118,15 +118,33 @@ class ServicePersonnelController extends AdminController $form->text('tel')->required(); $form->image('head_url')->autoUpload(); }); - $form->column(6,function(Form $form) use($marketList,$userList){ + $form->column(6,function(Form $form) use($marketList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); $form->select('market_id')->options($marketList)->required(); - $form->select('user_id')->options($userList)->required(); + // $form->select('user_id')->options($userList)->required(); + $form->number('user_id')->required()->min(0); $statusList = ServicePersonnelModel::$_STATUS; unset($statusList[0],$statusList[2]); $form->radio('status')->options($statusList)->default(1); }); - + + $form->saving(function(Form $form){ + $id = $form->getKey(); + $userId = $form->input('user_id'); + if(!empty($id) && !empty($userId)){ + $user = UserModel::getUserInfo($userId,'id'); + if(empty($user)){ + return $form->error('懒ID不存在'); + } + $store = ServicePersonnelModel::select('id')->where([ + ['user_id','=',$userId], + ['id','<>',$id?$id:0], + ])->first(); + if(!empty($store)){ + return $form->error('用户已经为服务专员'); + } + } + }); $form->saved(function(Form $form){ $id = $form->getKey(); diff --git a/app/Admin/Controllers/v3/UserController.php b/app/Admin/Controllers/v3/UserController.php index ecdfb1c..837b0a6 100644 --- a/app/Admin/Controllers/v3/UserController.php +++ b/app/Admin/Controllers/v3/UserController.php @@ -60,12 +60,14 @@ class UserController extends AdminController $show->field('real_name'); $show->field('tel'); $show->field('unionid'); - $show->field('status'); + $show->field('country'); $show->field('province'); $show->field('city'); - $show->field('gender'); + $show->field('gender_text'); $show->field('language'); + + $show->field('status_text'); $show->field('created_at'); $show->field('updated_at'); diff --git a/app/Console/Commands/MigrateGoods.php b/app/Console/Commands/MigrateGoods.php index 1289cf6..1f125c7 100644 --- a/app/Console/Commands/MigrateGoods.php +++ b/app/Console/Commands/MigrateGoods.php @@ -89,7 +89,7 @@ class MigrateGoods extends Command 'on_sale'=> $value->is_show == 1 ? 1 : 0, 'sort'=>$value->num, 'price'=>$value->money, - 'original_price'=>$value->money2, + 'original_price'=> ($value->money2 < $value->money)?$value->money:$value->money2, 'vip_price'=>$value->vip_money, 'sales'=>$value->sales, 'start_num'=>$value->start_num, diff --git a/resources/lang/zh-CN/service-personnel.php b/resources/lang/zh-CN/service-personnel.php index 04d05a2..015c00e 100644 --- a/resources/lang/zh-CN/service-personnel.php +++ b/resources/lang/zh-CN/service-personnel.php @@ -6,7 +6,7 @@ return [ 'service_personnel' => '服务站专员', ], 'fields' => [ - 'user_id' => '服务员懒ID', + 'user_id' => '服务专员懒ID', 'name' => '姓名', 'tel' => '电话', 'market_id' => '所属市场',