From 6a2125794b0c1641673ede5121b8fc2918483417 Mon Sep 17 00:00:00 2001 From: tokumeikoi Date: Fri, 18 Mar 2022 02:41:30 +0800 Subject: [PATCH] update: payment save --- .../Controllers/Admin/PaymentController.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 9b402fae..cc048d26 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -51,7 +51,7 @@ class PaymentController extends Controller if (!config('v2board.app_url')) { abort(500, '请在站点配置中配置站点地址'); } - $params = $request->validate([ + $validateRules = [ 'name' => 'required', 'icon' => 'nullable', 'payment' => 'required', @@ -59,19 +59,12 @@ class PaymentController extends Controller 'notify_domain' => 'nullable|url', 'handling_fee_fixed' => 'nullable|integer', 'handling_fee_percent' => 'nullable|numeric|between:0.1,100' - ], [ - 'name.required' => '显示名称不能为空', - 'payment.required' => '网关参数不能为空', - 'config.required' => '配置参数不能为空', - 'notify_domain.url' => '自定义通知域名格式有误', - 'handling_fee_fixed.integer' => '固定手续费格式有误', - 'handling_fee_percent.between' => '百分比手续费范围须在0.1-100之间' - ]); + ]; if ($request->input('id')) { $payment = Payment::find($request->input('id')); if (!$payment) abort(500, '支付方式不存在'); try { - $payment->update($params); + $payment->update($request->only(array_keys($validateRules))); } catch (\Exception $e) { abort(500, $e->getMessage()); } @@ -79,6 +72,14 @@ class PaymentController extends Controller 'data' => true ]); } + $params = $request->validate($validateRules, [ + 'name.required' => '显示名称不能为空', + 'payment.required' => '网关参数不能为空', + 'config.required' => '配置参数不能为空', + 'notify_domain.url' => '自定义通知域名格式有误', + 'handling_fee_fixed.integer' => '固定手续费格式有误', + 'handling_fee_percent.between' => '百分比手续费范围须在0.1-100之间' + ]); $params['uuid'] = Helper::randomChar(8); if (!Payment::create($params)) { abort(500, '保存失败');