feat(admin): 平台订单支持按同步失败原因关键词筛选并联动订阅失败原因跳转

This commit is contained in:
萝卜
2026-03-11 01:26:42 +00:00
parent 56ad448b82
commit 2cfff3681e
5 changed files with 136 additions and 1 deletions

View File

@@ -130,6 +130,8 @@ class PlatformOrderController extends Controller
'synced_only' => (string) $request->query('synced_only', ''),
'sync_status' => trim((string) $request->query('sync_status', '')),
'keyword' => trim((string) $request->query('keyword', '')),
// 同步失败原因关键词:用于快速定位同原因失败订单(可治理)
'sync_error_keyword' => trim((string) $request->query('sync_error_keyword', '')),
// 只看“可同步订阅”的订单:已支付 + 已生效 + 未同步(用于运营快速处理)
'syncable_only' => (string) $request->query('syncable_only', ''),
// 只看最近 24 小时批量同步过的订单(可治理追踪)
@@ -593,6 +595,8 @@ class PlatformOrderController extends Controller
'synced_only' => (string) $request->query('synced_only', ''),
'sync_status' => trim((string) $request->query('sync_status', '')),
'keyword' => trim((string) $request->query('keyword', '')),
// 同步失败原因关键词:用于快速定位同原因失败订单(可治理)
'sync_error_keyword' => trim((string) $request->query('sync_error_keyword', '')),
// 只看“可同步订阅”的订单:已支付 + 已生效 + 未同步(用于运营快速处理)
'syncable_only' => (string) $request->query('syncable_only', ''),
// 只看最近 24 小时批量同步过的订单(可治理追踪)
@@ -786,6 +790,7 @@ class PlatformOrderController extends Controller
'synced_only' => (string) $request->input('synced_only', ''),
'sync_status' => trim((string) $request->input('sync_status', '')),
'keyword' => trim((string) $request->input('keyword', '')),
'sync_error_keyword' => trim((string) $request->input('sync_error_keyword', '')),
'syncable_only' => (string) $request->input('syncable_only', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
// 与列表页筛选保持一致(可治理):用于在批量操作后仍能回到同一口径
@@ -917,6 +922,7 @@ class PlatformOrderController extends Controller
'synced_only' => (string) $request->input('synced_only', ''),
'sync_status' => trim((string) $request->input('sync_status', '')),
'keyword' => trim((string) $request->input('keyword', '')),
'sync_error_keyword' => trim((string) $request->input('sync_error_keyword', '')),
'syncable_only' => (string) $request->input('syncable_only', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
// 与列表页筛选保持一致(可治理):用于在批量操作后仍能回到同一口径
@@ -1026,6 +1032,7 @@ class PlatformOrderController extends Controller
'synced_only' => (string) $request->input('synced_only', ''),
'sync_status' => trim((string) $request->input('sync_status', '')),
'keyword' => trim((string) $request->input('keyword', '')),
'sync_error_keyword' => trim((string) $request->input('sync_error_keyword', '')),
'syncable_only' => (string) $request->input('syncable_only', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
// 与列表页筛选保持一致(可治理):用于在批量操作后仍能回到同一口径
@@ -1128,6 +1135,20 @@ class PlatformOrderController extends Controller
}
});
})
->when(($filters['sync_error_keyword'] ?? '') !== '', function (Builder $builder) use ($filters) {
// 同步失败原因关键词subscription_activation_error.message like
$kw = trim((string) ($filters['sync_error_keyword'] ?? ''));
if ($kw === '') {
return;
}
$driver = $builder->getQuery()->getConnection()->getDriverName();
if ($driver === 'sqlite') {
$builder->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') LIKE ?", ['%' . $kw . '%']);
} else {
$builder->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(meta, '$.subscription_activation_error.message')) LIKE ?", ['%' . $kw . '%']);
}
})
->when(($filters['syncable_only'] ?? '') !== '', function (Builder $builder) {
// 只看可同步:已支付 + 已生效 + 尚未写入 subscription_activation.subscription_id
$builder->where('payment_status', 'paid')

View File

@@ -107,6 +107,7 @@
<span>只看对账不一致(回执总额≠已付金额)</span>
</label>
<input type="text" name="keyword" placeholder="关键词:订单号/站点/订阅号" value="{{ $filters['keyword'] ?? '' }}">
<input type="text" name="sync_error_keyword" placeholder="失败原因关键词(可选)" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<div>
<button type="submit">应用筛选</button>
</div>
@@ -240,6 +241,7 @@
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
<input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
<input type="hidden" name="sync_error_keyword" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<input type="hidden" name="reconcile_mismatch" value="{{ $filters['reconcile_mismatch'] ?? '' }}">
<label class="form-inline-row mb-8">
@@ -267,6 +269,7 @@
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
<input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
<input type="hidden" name="sync_error_keyword" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<input type="hidden" name="reconcile_mismatch" value="{{ $filters['reconcile_mismatch'] ?? '' }}">
<label class="muted form-inline-row mb-8">
@@ -296,6 +299,7 @@
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
<input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
<input type="hidden" name="sync_error_keyword" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<input type="hidden" name="reconcile_mismatch" value="{{ $filters['reconcile_mismatch'] ?? '' }}">
<label class="muted form-inline-row mb-8">
<span>确认输入</span>
@@ -327,6 +331,7 @@
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
<input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
<input type="hidden" name="sync_error_keyword" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<input type="hidden" name="reconcile_mismatch" value="{{ $filters['reconcile_mismatch'] ?? '' }}">
<label class="muted form-inline-row mb-8">
@@ -372,6 +377,7 @@
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
<input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
<input type="hidden" name="sync_error_keyword" value="{{ $filters['sync_error_keyword'] ?? '' }}">
<input type="hidden" name="reconcile_mismatch" value="{{ $filters['reconcile_mismatch'] ?? '' }}">
<button type="submit">清除当前筛选范围的失败标记</button>
</form>

View File

@@ -200,7 +200,11 @@
@if(count($failedReasonStats) > 0)
<div class="muted mt-6">
@foreach($failedReasonStats as $item)
<div>{{ $item['reason'] }} <span class="muted">{{ $item['count'] }}</span></div>
@php $reason = (string) ($item['reason'] ?? ''); @endphp
<div>
<a class="link" href="{!! $makePlatformOrderUrl(['site_subscription_id' => $subscription->id, 'sync_status' => 'failed', 'sync_error_keyword' => $reason]) !!}">{{ $reason }}</a>
<span class="muted">{{ $item['count'] }}</span>
</div>
@endforeach
</div>
@else

View File

@@ -0,0 +1,98 @@
<?php
namespace Tests\Feature;
use App\Models\Merchant;
use App\Models\Plan;
use App\Models\PlatformOrder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminPlatformOrderSyncErrorKeywordFilterTest extends TestCase
{
use RefreshDatabase;
protected function loginAsPlatformAdmin(): void
{
$this->seed();
$this->post('/admin/login', [
'email' => 'platform.admin@demo.local',
'password' => 'Platform@123456',
])->assertRedirect('/admin');
}
public function test_platform_orders_page_can_filter_by_sync_error_keyword(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'sync_error_kw_test',
'name' => '同步失败关键词测试',
'billing_cycle' => 'monthly',
'price' => 10,
'list_price' => 10,
'status' => 'active',
'sort' => 10,
'published_at' => now(),
]);
PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'order_no' => 'PO_ERR_KW_0001',
'order_type' => 'renewal',
'status' => 'pending',
'payment_status' => 'unpaid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 0,
'placed_at' => now()->subMinutes(2),
'meta' => [
'subscription_activation_error' => [
'message' => '模拟失败:站点已过期',
'at' => now()->toDateTimeString(),
'admin_id' => 1,
],
],
]);
PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'order_no' => 'PO_ERR_KW_0002',
'order_type' => 'renewal',
'status' => 'pending',
'payment_status' => 'unpaid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 0,
'placed_at' => now()->subMinutes(1),
'meta' => [
'subscription_activation_error' => [
'message' => '余额不足',
'at' => now()->toDateTimeString(),
'admin_id' => 1,
],
],
]);
$this->get('/admin/platform-orders?sync_error_keyword=' . urlencode('已过期'))
->assertOk()
->assertSee('PO_ERR_KW_0001')
->assertDontSee('PO_ERR_KW_0002');
// 未命中关键词:应不展示任何一条
$this->get('/admin/platform-orders?sync_error_keyword=' . urlencode('不存在的关键词'))
->assertOk()
->assertDontSee('PO_ERR_KW_0001')
->assertDontSee('PO_ERR_KW_0002');
}
}

View File

@@ -95,6 +95,11 @@ class AdminSiteSubscriptionShowTest extends TestCase
'last_amount' => 10,
'last_channel' => 'bank_transfer',
],
'subscription_activation_error' => [
'message' => '模拟失败:站点已过期',
'at' => now()->toDateTimeString(),
'admin_id' => 1,
],
],
]);
@@ -107,6 +112,7 @@ class AdminSiteSubscriptionShowTest extends TestCase
->assertSee('可同步(已支付+已生效+未同步)')
->assertSee('未同步(无记录)')
->assertSee('失败原因Top3')
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&sync_status=failed&sync_error_keyword=' . urlencode('模拟失败:站点已过期'), false)
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&sync_status=synced', false)
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&sync_status=failed', false)
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&syncable_only=1', false)