From df88e7b605595911c8699d16b87e8c33eacf8e62 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 14 Sep 2020 19:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=99=E4=B8=93=E5=91=98?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AF=84=E4=BB=B7=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQRCode.php | 2 +- .../Common/{QRCode.php => WeChatQrCode.php} | 12 +++++------ .../v3/ServicePersonnelController.php | 21 +++++++++++++++---- app/Admin/Controllers/v3/StoreController.php | 4 ++-- 4 files changed, 26 insertions(+), 13 deletions(-) rename app/Admin/Common/{QRCode.php => WeChatQrCode.php} (53%) diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php index 7f639bb..dac7c24 100644 --- a/app/Admin/Common/StoreQRCode.php +++ b/app/Admin/Common/StoreQRCode.php @@ -6,7 +6,7 @@ use Dcat\Admin\Controllers\AdminController; use EasyWeChat\Factory; use Intervention\Image\ImageManager; -class StoreQRCode extends AdminController +class StoreQrCode extends AdminController { protected $images; protected $imageManager; diff --git a/app/Admin/Common/QRCode.php b/app/Admin/Common/WeChatQrCode.php similarity index 53% rename from app/Admin/Common/QRCode.php rename to app/Admin/Common/WeChatQrCode.php index 323c17d..74dc0be 100644 --- a/app/Admin/Common/QRCode.php +++ b/app/Admin/Common/WeChatQrCode.php @@ -5,7 +5,7 @@ namespace App\Admin\Common; use Dcat\Admin\Controllers\AdminController; use EasyWeChat\Factory; -class QRCode extends AdminController +class WeChatQrCode extends AdminController { protected $images; @@ -17,15 +17,15 @@ class QRCode extends AdminController /** * 服务站专员评价小程序码 */ - public function getServicePersonnel($id, $path) + public function getServicePersonnel($id) { $param = "page=details&id={$id}"; $path = "zh_cjdianc/pages/Liar/loginindex"; - $codeStore = $this->images->createQrCode($param,$path); - $storeImgPath = 'QR_code/code_service_personnel_img/personnel_'.$id.'.jpg'; - $res = $this->images->uploadOss($codeStore,$storeImgPath); + $codeImg = $this->images->createQrCode($param,$path); + $imgPath = 'public/upload/qrcode/'.date('Y') . '/' . date('m-d') . '/' . date('His').md5(time()).'.png';/* 生成唯一文件名 */ + $res = $this->images->uploadOss($codeImg,$imgPath); if($res){ - return ['status' => true ,'path' => $storeImgPath]; + return ['status' => true ,'path' => $imgPath]; }else{ return ['status' => false ,'path' => '']; } diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 43d77e0..5ed0c54 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -10,6 +10,7 @@ use Dcat\Admin\Controllers\AdminController; use App\Models\v3\ServicePersonnel as ServicePersonnelModel; use App\Models\v3\Market as MarketModel; use App\Models\v3\User as UserModel; +use App\Admin\Common\WeChatQrCode; class ServicePersonnelController extends AdminController { @@ -81,6 +82,7 @@ class ServicePersonnelController extends AdminController protected function form() { return Form::make(new ServicePersonnel(), function (Form $form) { + $userId = $form->model()->user_id; //市场 $marketList = MarketModel::getMarketArray(); // 用户 @@ -88,7 +90,7 @@ class ServicePersonnelController extends AdminController // 已绑定的用户 $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas)){ + if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ unset($userList[$ku]); } } @@ -103,13 +105,24 @@ class ServicePersonnelController extends AdminController $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); $form->select('market_id')->options($marketList)->required(); $form->select('user_id')->options($userList)->required(); + $statusList = ServicePersonnelModel::$_STATUS; + unset($statusList[0],$statusList[2]); + $form->radio('status')->options($statusList)->default(1); }); $form->saved(function(Form $form){ $id = $form->getKey(); - - // 生产专员二维码 - $qrCode = 0; + + if($form->isCreating && !empty($id)){ + $model = ServicePersonnelModel::find($id); + $qrCode = new WeChatQrCode(); + // 生成专员二维码 + $qrCodeImg = $qrCode->getServicePersonnel($id); + if($qrCodeImg['status']){ + $model->qr_url = $qrCodeImg['path']; + $model->save(); + } + } }); $form->disableResetButton(); $form->disableViewCheck(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 0e238ea..ccff02c 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -9,7 +9,7 @@ use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use App\Models\LanzuMmInfo as MminfoModel; use App\Models\v3\Market as MarketModel; -use App\Admin\Common\StoreQRCode; +use App\Admin\Common\StoreQrCode; use App\Models\v3\Store as StoreModel; use App\Models\v3\User as UserModel; use App\Models\v3\Category as CategoryModel; @@ -233,7 +233,7 @@ class StoreController extends AdminController } if($form->isCreating() && !empty($id)){ - $qrCode = new StoreQRCode(); + $qrCode = new StoreQrCode(); // 生成小程序码 店铺 $sRes = $qrCode->SetStoreWeChatCode($id);