From 7087c22259e8f19588b0c2ed5cf94310803a18ab Mon Sep 17 00:00:00 2001 From: lkddi Date: Sat, 11 Apr 2026 12:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ChatController.php | 6 +++--- app/Http/Controllers/VipPaymentController.php | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/ChatController.php b/app/Http/Controllers/ChatController.php index 05a16da..eb31c4c 100644 --- a/app/Http/Controllers/ChatController.php +++ b/app/Http/Controllers/ChatController.php @@ -554,10 +554,10 @@ class ChatController extends Controller // 确定用户称号:管理员 > VIP 名称 > 普通会员 $title = '普通会员'; - if ($user->user_level >= $superLevel) { - $title = '管理员'; - } elseif ($user->isVip()) { + if ($user->isVip()) { $title = $user->vipName() ?: '会员'; + } elseif ($user->user_level >= $superLevel) { + $title = '管理员'; } return response()->json([ diff --git a/app/Http/Controllers/VipPaymentController.php b/app/Http/Controllers/VipPaymentController.php index f078469..989b6b6 100644 --- a/app/Http/Controllers/VipPaymentController.php +++ b/app/Http/Controllers/VipPaymentController.php @@ -37,7 +37,7 @@ class VipPaymentController extends Controller public function store(CreateVipPaymentOrderRequest $request): RedirectResponse { if (! $this->paymentCenterClient->isEnabled() || ! $this->paymentCenterClient->hasValidConfig()) { - return redirect()->route('guide')->with('error', 'VIP 支付暂未开放,请联系管理员完成后台配置。'); + return redirect()->route('vip.center')->with('error', 'VIP 支付暂未开放,请联系管理员完成后台配置。'); } $vipLevel = VipLevel::query()->findOrFail((int) $request->validated('vip_level_id')); @@ -54,7 +54,7 @@ class VipPaymentController extends Controller return redirect()->away($payUrl); } catch (\Throwable $exception) { - return redirect()->route('guide')->with('error', '创建 VIP 支付订单失败:'.$exception->getMessage()); + return redirect()->route('vip.center')->with('error', '创建 VIP 支付订单失败:'.$exception->getMessage()); } } @@ -70,7 +70,7 @@ class VipPaymentController extends Controller ?? $this->vipPaymentService->findByMerchantOrderNo($request->string('merchant_order_no')->toString()); if (! $vipPaymentOrder) { - return redirect()->route('guide')->with('error', '未找到对应的 VIP 支付订单,请稍后在后台核对。'); + return redirect()->route('vip.center')->with('error', '未找到对应的 VIP 支付订单,请稍后在后台核对。'); } $this->vipPaymentService->recordSyncReturn($vipPaymentOrder, $payload); @@ -79,14 +79,14 @@ class VipPaymentController extends Controller // 同步回调只做页面回跳,但这里补查一次可让用户尽快看到最终结果。 $vipPaymentOrder = $this->vipPaymentService->syncRemoteStatus($vipPaymentOrder); } catch (\Throwable $exception) { - return redirect()->route('guide')->with('error', '支付结果正在确认中,请稍后刷新查看。'); + return redirect()->route('vip.center')->with('error', '支付结果正在确认中,请稍后刷新查看。'); } if ($vipPaymentOrder->isVipOpened()) { - return redirect()->route('guide')->with('success', 'VIP 支付成功,会员已开通。'); + return redirect()->route('vip.center')->with('success', 'VIP 支付成功,会员已开通。'); } - return redirect()->route('guide')->with('success', '支付页面已返回,系统正在确认支付结果,请稍后刷新查看。'); + return redirect()->route('vip.center')->with('success', '支付页面已返回,系统正在确认支付结果,请稍后刷新查看。'); } /**