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

feat: platform order index sync failed reason link prefer batch run

Browse Source
This commit is contained in:
萝卜
2026-03-18 12:17:45 +08:00
parent 83332f265d
commit 6973e5af21
2 changed files with 124 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/views/admin/platform_orders/index.blade.php
View File

@@ -1477,14 +1477,58 @@
<span class="muted">-</span> <span class="muted">-</span>
@else @else
@if($syncErrMsg !== '') @if($syncErrMsg !== '')
@php
// 同步失败：默认落到“可执行集合”（优先同批次）
$basRunIdRow = (string) (data_get($order->meta, 'batch_activation.last_result.run_id') ?? '');
if ($basRunIdRow === '') {
$basRunIdRow = (string) (data_get($order->meta, 'batch_activation.run_id') ?? '');
}
$syncGoFailedUrl = $buildQuickFilterUrl([
'sync_status' => 'failed',
'page' => null,
]);
$syncGoBatchFailedUrl = '';
$syncGoBatchReasonUrl = '';
if ($basRunIdRow !== '') {
$syncGoBatchFailedUrl = $buildQuickFilterUrl([
'batch_activation_run_id' => $basRunIdRow,
'sync_status' => 'failed',
'page' => null,
]);
if (! $syncErrTooLong) {
$syncGoBatchReasonUrl = $buildQuickFilterUrl([
'batch_activation_run_id' => $basRunIdRow,
'sync_status' => 'failed',
'sync_error_keyword' => $syncErrMsg,
'page' => null,
]);
}
}
$syncGoReasonUrl = $buildQuickFilterUrl([
'sync_error_keyword' => $syncErrMsg,
'sync_status' => 'failed',
'page' => null,
]);
$syncErrorLinkUrl = $syncGoBatchReasonUrl !== '' ? $syncGoBatchReasonUrl : $syncGoReasonUrl;
@endphp
<div> <div>
<span class="muted muted-xs">同步：</span> <span class="muted muted-xs">同步：</span>
@if($syncErrTooLong) @if($syncErrTooLong)
<span class="muted text-danger" title="{{ $syncErrMsg }}">{{ mb_substr($syncErrMsg, 0, $SYNC_FAILED_REASON_TRUNCATE_LEN) }}</span> <span class="muted text-danger" title="{{ $syncErrMsg }}">{{ mb_substr($syncErrMsg, 0, $SYNC_FAILED_REASON_TRUNCATE_LEN) }}</span>
<div class="muted text-danger muted-xs">原因过长，请复制到筛选框</div> <div class="muted text-danger muted-xs">原因过长，请复制到筛选框</div>
<a class="link" href="{!! $safeFullUrlWithQuery(['sync_status' => 'failed', 'page' => null]) !!}">进入同步失败集合</a>
@if($syncGoBatchFailedUrl !== '')
<div class="muted muted-xs">治理：<a class="link" href="{!! $syncGoBatchFailedUrl !!}">进入本批次同步失败集合</a></div>
@else
<div class="muted muted-xs">治理：<a class="link" href="{!! $syncGoFailedUrl !!}">进入同步失败集合</a></div>
@endif
@else @else
<a class="link text-danger" href="{!! $safeFullUrlWithQuery(['sync_error_keyword' => $syncErrMsg, 'sync_status' => 'failed', 'page' => null]) !!}">{{ mb_substr($syncErrMsg, 0, $SYNC_FAILED_REASON_TRUNCATE_LEN) }}</a> <a class="link text-danger" href="{!! $syncErrorLinkUrl !!}">{{ mb_substr($syncErrMsg, 0, $SYNC_FAILED_REASON_TRUNCATE_LEN) }}</a>
@endif @endif
</div> </div>
@endif @endif

78
tests/Feature/AdminPlatformOrderIndexSyncFailedReasonLinkShouldPreferBatchRunIdWhenPresentTest.php Normal file
View File

@@ -0,0 +1,78 @@
<?php
namespace Tests\Feature;
use App\Models\Admin;
use App\Models\Merchant;
use App\Models\Plan;
use App\Models\PlatformOrder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminPlatformOrderIndexSyncFailedReasonLinkShouldPreferBatchRunIdWhenPresentTest 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_order_index_sync_failed_reason_link_should_prefer_batch_run_id_when_present(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
$plan = Plan::query()->create([
'code' => 'po_index_sync_failed_link_plan',
'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,
'site_subscription_id' => null,
'created_by_admin_id' => $platformAdminId ?: null,
'order_no' => 'PO_INDEX_SYNC_FAILED_LINK_0001',
'order_type' => 'new_purchase',
'status' => 'activated',
'payment_status' => 'paid',
'payable_amount' => 10,
'paid_amount' => 10,
'placed_at' => now(),
'meta' => [
'subscription_activation_error' => [
'message' => 'SYNC_FAILED_KEYWORD_DEMO',
],
'batch_activation' => [
'last_result' => [
'run_id' => 'BAS_RUN_ID_0001',
],
],
],
]);
$res = $this->get('/admin/platform-orders');
$res->assertOk();
$res->assertSee('PO_INDEX_SYNC_FAILED_LINK_0001');
// 行内“同步失败原因”应优先落到“本批次按原因筛选”（而不是全局原因筛选），减少噪音并提升可执行性
$res->assertSee('batch_activation_run_id=BAS_RUN_ID_0001', false);
$res->assertSee('sync_status=failed', false);
$res->assertSee('sync_error_keyword=SYNC_FAILED_KEYWORD_DEMO', false);
}
}