linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(admin): AdminFlash增加apply并在批量动作成功提示复用

Browse Source
This commit is contained in:
萝卜
2026-03-17 19:11:07 +08:00
parent bfc04d8f36
commit 23476b0ac3
3 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -1662,14 +1662,7 @@ class PlatformOrderController extends Controller
'进入批次复盘',
);
$res = redirect()->back()->with('success', (string) ($flash['success'] ?? ''));
foreach (['success_link_href', 'success_link_label'] as $k) {
if (isset($flash[$k]) && (string) $flash[$k] !== '') {
$res = $res->with($k, (string) $flash[$k]);
}
}
return $res;
return \App\Support\AdminFlash::apply(redirect()->back(), $flash);
}
public function batchMarkPaidAndActivate(Request $request, SubscriptionActivationService $service): RedirectResponse
@@ -1825,14 +1818,7 @@ class PlatformOrderController extends Controller
'进入批次复盘',
);
$res = redirect()->back()->with('success', (string) ($flash['success'] ?? ''));
foreach (['success_link_href', 'success_link_label'] as $k) {
if (isset($flash[$k]) && (string) $flash[$k] !== '') {
$res = $res->with($k, (string) $flash[$k]);
}
}
return $res;
return \App\Support\AdminFlash::apply(redirect()->back(), $flash);
}
public function batchMarkActivated(Request $request): RedirectResponse
@@ -2030,14 +2016,7 @@ class PlatformOrderController extends Controller
'查看本次批量结果',
);
$res = redirect()->back()->with('success', (string) ($flash['success'] ?? ''));
foreach (['success_link_href', 'success_link_label'] as $k) {
if (isset($flash[$k]) && (string) $flash[$k] !== '') {
$res = $res->with($k, (string) $flash[$k]);
}
}
return $res;
return \App\Support\AdminFlash::apply(redirect()->back(), $flash);
}
public function clearSyncError(Request $request, PlatformOrder $order): RedirectResponse

35
app/Support/AdminFlash.php
View File

@@ -57,4 +57,39 @@ class AdminFlash
return $payload;
}
/**
* 把 payload 批量 apply 到 redirect response（统一 session key 处理口径）。
*
* @param object $redirect 需提供 ->with($key,$value)
*/
public static function apply(object $redirect, array $payload): object
{
$alwaysKeys = ['success', 'warning', 'error'];
foreach ($payload as $k => $v) {
$k = (string) $k;
if (in_array($k, $alwaysKeys, true)) {
$redirect = $redirect->with($k, $v);
continue;
}
if ($v === null) {
continue;
}
if (is_string($v)) {
if (trim($v) === '') {
continue;
}
$redirect = $redirect->with($k, $v);
continue;
}
$redirect = $redirect->with($k, $v);
}
return $redirect;
}
}

39
tests/Unit/AdminFlashApplyTest.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
namespace Tests\Unit;
use App\Support\AdminFlash;
use PHPUnit\Framework\TestCase;
class AdminFlashApplyTest extends TestCase
{
public function test_apply_should_call_with_for_non_empty_values(): void
{
$redirect = new class {
public array $calls = [];
public function with($k, $v)
{
$this->calls[] = [$k, $v];
return $this;
}
};
$payload = [
'success' => 'ok',
'success_link_href' => '/admin/x',
'success_link_label' => '查看',
'warning_copy_text' => '', // 空字符串应跳过
];
AdminFlash::apply($redirect, $payload);
$this->assertNotEmpty($redirect->calls);
$keys = array_map(fn ($x) => (string) $x[0], $redirect->calls);
$this->assertContains('success', $keys);
$this->assertContains('success_link_href', $keys);
$this->assertContains('success_link_label', $keys);
$this->assertNotContains('warning_copy_text', $keys);
}
}