ui(platform-orders): render bmpa last_result summary in list
This commit is contained in:
@@ -1239,6 +1239,7 @@
|
|||||||
<th class="col-optional">同步时间</th>
|
<th class="col-optional">同步时间</th>
|
||||||
<th class="col-optional">失败原因</th>
|
<th class="col-optional">失败原因</th>
|
||||||
<th class="col-optional">最近批量同步</th>
|
<th class="col-optional">最近批量同步</th>
|
||||||
|
<th class="col-optional">最近批量BMPA</th>
|
||||||
<th class="col-optional">最近批量生效</th>
|
<th class="col-optional">最近批量生效</th>
|
||||||
<th class="col-optional">回执总额</th>
|
<th class="col-optional">回执总额</th>
|
||||||
<th class="col-optional">对账差额</th>
|
<th class="col-optional">对账差额</th>
|
||||||
@@ -1563,6 +1564,41 @@
|
|||||||
<span class="muted">-</span>
|
<span class="muted">-</span>
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
<td class="col-optional">
|
||||||
|
@php
|
||||||
|
// 优先使用扁平字段 meta.batch_mark_paid_and_activate(便于筛选/统计,也避免遍历 audit)
|
||||||
|
$batchBmpa = (array) (data_get($order->meta, 'batch_mark_paid_and_activate', []) ?? []);
|
||||||
|
$bmpaAt = (string) (data_get($batchBmpa, 'at') ?? '');
|
||||||
|
$bmpaAdminId = data_get($batchBmpa, 'admin_id');
|
||||||
|
$bmpaRunId = (string) (data_get($batchBmpa, 'run_id') ?? '');
|
||||||
|
|
||||||
|
$bmpaLastResult = (array) (data_get($batchBmpa, 'last_result', []) ?? []);
|
||||||
|
$blrRunId = (string) (data_get($bmpaLastResult, 'run_id') ?? '');
|
||||||
|
$blrSuccess = (int) (data_get($bmpaLastResult, 'success') ?? 0);
|
||||||
|
$blrFailed = (int) (data_get($bmpaLastResult, 'failed') ?? 0);
|
||||||
|
$blrTopReason = (string) (data_get($bmpaLastResult, 'top_reasons.0.reason') ?? '');
|
||||||
|
$blrTopReasonCount = (int) (data_get($bmpaLastResult, 'top_reasons.0.count') ?? 0);
|
||||||
|
@endphp
|
||||||
|
@if($bmpaAt !== '')
|
||||||
|
<div>{{ $bmpaAt }}</div>
|
||||||
|
<div class="muted">管理员:{{ $bmpaAdminId ?: '-' }}</div>
|
||||||
|
|
||||||
|
@if($bmpaRunId !== '')
|
||||||
|
<div class="muted muted-xs">批次:
|
||||||
|
<a class="link" href="{!! $safeFullUrlWithQuery(['batch_bmpa_run_id' => $bmpaRunId, 'page' => null]) !!}">{{ $bmpaRunId }}</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($blrRunId !== '')
|
||||||
|
<div class="muted muted-xs">结果:成功{{ $blrSuccess }} / 失败{{ $blrFailed }}</div>
|
||||||
|
@if($blrTopReason !== '')
|
||||||
|
<div class="muted muted-xs">Top:{{ mb_substr($blrTopReason, 0, 40) }}({{ $blrTopReasonCount }})</div>
|
||||||
|
@endif
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
|
<span class="muted">-</span>
|
||||||
|
@endif
|
||||||
|
</td>
|
||||||
<td class="col-optional">
|
<td class="col-optional">
|
||||||
@php
|
@php
|
||||||
// 优先使用扁平字段 meta.batch_mark_activated(便于筛选/统计,也避免遍历 audit)
|
// 优先使用扁平字段 meta.batch_mark_activated(便于筛选/统计,也避免遍历 audit)
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
<?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 AdminPlatformOrderIndexBatchBmpaLastResultShouldRenderTest 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_should_render_batch_bmpa_last_result_summary_when_present(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'po_batch_bmpa_last_result_render_plan',
|
||||||
|
'name' => '批量BMPA last_result 渲染测试套餐',
|
||||||
|
'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_BATCH_BMPA_LAST_RESULT_RENDER_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'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(10),
|
||||||
|
'meta' => [
|
||||||
|
'batch_mark_paid_and_activate' => [
|
||||||
|
'at' => now()->toDateTimeString(),
|
||||||
|
'admin_id' => 1,
|
||||||
|
'scope' => 'filtered',
|
||||||
|
'mode' => 'sync',
|
||||||
|
'run_id' => 'BMPA_TEST_0001',
|
||||||
|
'last_result' => [
|
||||||
|
'run_id' => 'BMPA_TEST_0001',
|
||||||
|
'success' => 3,
|
||||||
|
'failed' => 1,
|
||||||
|
'matched' => 10,
|
||||||
|
'processed' => 4,
|
||||||
|
'top_reasons' => [
|
||||||
|
['reason' => '模拟失败:回执金额不一致', 'count' => 1],
|
||||||
|
],
|
||||||
|
'at' => now()->toDateTimeString(),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->get('/admin/platform-orders')
|
||||||
|
->assertOk()
|
||||||
|
->assertSee('结果:成功3 / 失败1')
|
||||||
|
->assertSee('模拟失败:回执金额不一致');
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user