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

feat(admin): 仪表盘可同步入口显示计数（口径对齐平台订单）

Browse Source
This commit is contained in:
萝卜
2026-03-15 19:53:24 +08:00
parent 0a5b86ac55
commit 452ac450c8
3 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -58,6 +58,17 @@ class DashboardController extends Controller
// 口径对齐“待生效”语义：排除明确的同步失败（失败单应该去同步失败治理）
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL")
->count(),
// 可同步：沿用平台订单列表口径（paid+activated+未同步+无失败），且排除续费缺订阅脏数据
'platform_orders_syncable' => PlatformOrder::query()
->where('payment_status', 'paid')
->where('status', 'activated')
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NULL")
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL")
->where(function ($q) {
$q->where('order_type', '!=', 'renewal')
->orWhereNotNull('site_subscription_id');
})
->count(),
// 同步失败：沿用平台订单列表口径（meta.subscription_activation_error.message 存在即失败）
'platform_orders_sync_failed' => PlatformOrder::query()
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NOT NULL")

2
resources/views/admin/dashboard.blade.php
View File

@@ -101,7 +101,7 @@
<div class="actions mt-8">
<a class="btn btn-secondary btn-sm" href="{!! $platformOrdersQuickLinks['unpaid_pending'] !!}">待支付（{{ (int) ($stats['platform_orders_unpaid_pending'] ?? 0) }}）</a>
<a class="btn btn-secondary btn-sm" href="{!! $platformOrdersQuickLinks['paid_pending'] !!}">待生效（{{ (int) ($stats['platform_orders_paid_pending'] ?? 0) }}）</a>
<a class="btn btn-secondary btn-sm" href="{!! $platformOrdersQuickLinks['syncable_only'] !!}">可同步</a>
<a class="btn btn-secondary btn-sm" href="{!! $platformOrdersQuickLinks['syncable_only'] !!}">可同步（{{ (int) ($stats['platform_orders_syncable'] ?? 0) }}）</a>
<a class="btn btn-secondary btn-sm" href="{!! $platformOrdersQuickLinks['sync_failed'] !!}">同步失败（{{ (int) ($stats['platform_orders_sync_failed'] ?? 0) }}）</a>
<a class="btn btn-secondary btn-sm" href="{!! \App\Support\BackUrl::withBack('/admin/platform-orders?renewal_missing_subscription=1', $selfWithoutBack) !!}">续费缺订阅（{{ (int) ($stats['platform_orders_renewal_missing_subscription'] ?? 0) }}）</a>
</div>

58
tests/Feature/AdminDashboardBillingWorkbenchSyncableCountShouldRenderTest.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
namespace Tests\Feature;
use App\Models\Admin;
use App\Models\Merchant;
use App\Models\PlatformOrder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Cache;
use Tests\TestCase;
class AdminDashboardBillingWorkbenchSyncableCountShouldRenderTest 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_dashboard_billing_workbench_syncable_count_should_render(): void
{
Cache::flush();
$this->loginAsPlatformAdmin();
$merchantId = (int) Merchant::query()->value('id');
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
// seed 已包含 1 条已支付+已生效且未写入 subscription_activation 的平台订单（可同步口径下应命中）
// 这里再额外构造 1 条，最终期望显示为 2。
PlatformOrder::query()->create([
'merchant_id' => $merchantId,
'plan_id' => null,
'site_subscription_id' => 1,
'created_by_admin_id' => $platformAdminId ?: null,
'order_no' => 'PO_DASHBOARD_SYNCABLE_001',
'order_type' => 'new_purchase',
'status' => 'activated',
'payment_status' => 'paid',
'payable_amount' => 9,
'paid_amount' => 9,
'meta' => [],
]);
Cache::flush();
$res = $this->get('/admin');
$res->assertOk();
$res->assertSee('可同步（2）');
}
}