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

admin: subscription show bmpa summary add success/failed links

Browse Source
This commit is contained in:
萝卜
2026-03-18 04:41:15 +08:00
parent 59910e05aa
commit 8fcf880a92
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Admin/SiteSubscriptionController.php
View File

@@ -94,11 +94,18 @@ class SiteSubscriptionController extends Controller
}
}
// 订阅维度：BMPA（批量标记支付并生效）失败订单数（与平台订单列表 bmpa_failed_only 口径一致）
// 订阅维度：BMPA（批量标记支付并生效）成功/失败订单数
// - 失败口径与平台订单列表 bmpa_failed_only 一致：error.message 存在
// - 成功口径与 bmpa_success_only 一致：存在 run_id 且 error.message 为空
$bmpaFailedOrders = (clone $baseOrdersQuery)
->whereRaw("JSON_EXTRACT(meta, '$.batch_mark_paid_and_activate_error.message') IS NOT NULL")
->count();
$bmpaSuccessOrders = (clone $baseOrdersQuery)
->whereRaw("JSON_EXTRACT(meta, '$.batch_mark_paid_and_activate.run_id') IS NOT NULL")
->whereRaw("JSON_EXTRACT(meta, '$.batch_mark_paid_and_activate_error.message') IS NULL")
->count();
$summaryStats = $summaryStats + [
'receipt_orders' => $receiptOrders,
'no_receipt_orders' => $noReceiptOrders,
@@ -110,7 +117,8 @@ class SiteSubscriptionController extends Controller
'refund_inconsistent_orders' => (int) $refundInconsistentOrders,
// 对账不一致订单（订阅维度）
'reconcile_mismatch_orders' => (int) $reconcileMismatchOrders,
// BMPA 失败订单（订阅维度）
// BMPA 成功/失败订单（订阅维度）
'bmpa_success_orders' => (int) $bmpaSuccessOrders,
'bmpa_failed_orders' => (int) $bmpaFailedOrders,
// 对账差额：回执总额 - 已付总额（订阅维度）
'reconciliation_delta' => (float) ($totalReceiptAmount - (float) $metaOrders->sum('paid_amount')),

6
resources/views/admin/site_subscriptions/show.blade.php
View File

@@ -328,11 +328,13 @@
</div>
<div class="card">
<h3>BMPA 失败数</h3>
<h3>BMPA 成功 / 失败</h3>
<div class="num-md">
<a class="link" href="{!! $makePlatformOrderUrl(['site_subscription_id' => $subscription->id, 'bmpa_success_only' => '1']) !!}">{{ $summaryStats['bmpa_success_orders'] ?? 0 }}</a>
<span class="muted"> / </span>
<a class="link" href="{!! $makePlatformOrderUrl(['site_subscription_id' => $subscription->id, 'bmpa_failed_only' => '1']) !!}">{{ $summaryStats['bmpa_failed_orders'] ?? 0 }}</a>
</div>
<div class="muted muted-xs">点击跳转：该订阅下「批量标记支付并生效失败」订单</div>
<div class="muted muted-xs">点击跳转：该订阅下「BMPA成功 / BMPA失败」订单集合</div>
</div>
<div class="card">

5
tests/Feature/AdminSiteSubscriptionBmpaFailedSummaryCardTest.php
View File

@@ -23,7 +23,7 @@ class AdminSiteSubscriptionBmpaFailedSummaryCardTest extends TestCase
])->assertRedirect('/admin');
}
public function test_subscription_show_page_has_bmpa_failed_summary_card_and_link(): void
public function test_subscription_show_page_has_bmpa_summary_card_and_links(): void
{
$this->loginAsPlatformAdmin();
@@ -81,8 +81,9 @@ class AdminSiteSubscriptionBmpaFailedSummaryCardTest extends TestCase
$this->get('/admin/site-subscriptions/' . $sub->id)
->assertOk()
->assertSee('BMPA 失败数')
->assertSee('BMPA 成功 / 失败')
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&bmpa_failed_only=1', false)
->assertSee('/admin/platform-orders?site_subscription_id=' . $sub->id . '&bmpa_success_only=1', false)
->assertSee('1');
}
}