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

feat(platform-orders): filter batch activation by run_id

Browse Source
This commit is contained in:
萝卜
2026-03-17 13:10:46 +08:00
parent f837c16bf5
commit ab02e5ca6b
3 changed files with 122 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -260,6 +260,8 @@ class PlatformOrderController extends Controller
'renewal_missing_subscription' => (string) $request->query('renewal_missing_subscription', ''),
// 只看最近 24 小时批量同步过的订单（可治理追踪）
'batch_synced_24h' => (string) $request->query('batch_synced_24h', ''),
// 批次号筛选：用于队列批量同步 run_id 追溯
'batch_activation_run_id' => trim((string) $request->query('batch_activation_run_id', '')),
// 只看最近 24 小时批量“标记支付并生效(BMPA)”过的订单（可治理追踪）
'batch_mark_paid_and_activate_24h' => (string) $request->query('batch_mark_paid_and_activate_24h', ''),
// 只看最近 24 小时批量“仅标记为已生效”过的订单（可治理追踪）
@@ -1292,6 +1294,8 @@ class PlatformOrderController extends Controller
'renewal_missing_subscription' => (string) $request->query('renewal_missing_subscription', ''),
// 只看最近 24 小时批量同步过的订单（可治理追踪）
'batch_synced_24h' => (string) $request->query('batch_synced_24h', ''),
// 批次号筛选：用于队列批量同步 run_id 追溯
'batch_activation_run_id' => trim((string) $request->query('batch_activation_run_id', '')),
// 只看最近 24 小时批量“标记支付并生效(BMPA)”过的订单（可治理追踪）
'batch_mark_paid_and_activate_24h' => (string) $request->query('batch_mark_paid_and_activate_24h', ''),
// 只看最近 24 小时批量“仅标记为已生效”过的订单（可治理追踪）
@@ -1476,6 +1480,7 @@ class PlatformOrderController extends Controller
'syncable_only' => (string) $request->input('syncable_only', ''),
'renewal_missing_subscription' => (string) $request->input('renewal_missing_subscription', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
'batch_activation_run_id' => trim((string) $request->input('batch_activation_run_id', '')),
// 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径
'batch_mark_paid_and_activate_24h' => (string) $request->input('batch_mark_paid_and_activate_24h', ''),
'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''),
@@ -1870,6 +1875,7 @@ class PlatformOrderController extends Controller
'syncable_only' => (string) $request->input('syncable_only', ''),
'renewal_missing_subscription' => (string) $request->input('renewal_missing_subscription', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
'batch_activation_run_id' => trim((string) $request->input('batch_activation_run_id', '')),
// 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径
'batch_mark_paid_and_activate_24h' => (string) $request->input('batch_mark_paid_and_activate_24h', ''),
'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''),
@@ -2122,6 +2128,7 @@ class PlatformOrderController extends Controller
'syncable_only' => (string) $request->input('syncable_only', ''),
'renewal_missing_subscription' => (string) $request->input('renewal_missing_subscription', ''),
'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''),
'batch_activation_run_id' => trim((string) $request->input('batch_activation_run_id', '')),
// 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径
'batch_mark_paid_and_activate_24h' => (string) $request->input('batch_mark_paid_and_activate_24h', ''),
'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''),
@@ -2408,6 +2415,20 @@ class PlatformOrderController extends Controller
$builder->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(meta, '$.batch_activation.at')) >= ?", [$since]);
}
})
->when(($filters['batch_activation_run_id'] ?? '') !== '', function (Builder $builder) use ($filters) {
// 按批次号筛选：用于队列批量同步 run_id 追溯
$runId = trim((string) ($filters['batch_activation_run_id'] ?? ''));
if ($runId === '') {
return;
}
$driver = $builder->getQuery()->getConnection()->getDriverName();
if ($driver === 'sqlite') {
$builder->whereRaw("JSON_EXTRACT(meta, '$.batch_activation.run_id') = ?", [$runId]);
} else {
$builder->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(meta, '$.batch_activation.run_id')) = ?", [$runId]);
}
})
->when(($filters['batch_mark_paid_and_activate_24h'] ?? '') !== '', function (Builder $builder) {
// 只看最近 24 小时批量“标记支付并生效(BMPA)”过的订单（基于 meta.batch_mark_paid_and_activate.at）
$since = now()->subHours(24)->format('Y-m-d H:i:s');

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

@@ -471,6 +471,7 @@
<input type="checkbox" name="batch_synced_24h" value="1" @checked(($filters['batch_synced_24h'] ?? '') === '1')>
<span>最近24小时批量同步过</span>
</label>
<input type="text" name="batch_activation_run_id" placeholder="批次号 run_id（可选）" value="{{ $filters['batch_activation_run_id'] ?? '' }}" class="w-200">
<label class="form-inline-row">
<input type="checkbox" name="batch_mark_paid_and_activate_24h" value="1" @checked(($filters['batch_mark_paid_and_activate_24h'] ?? '') === '1')>
<span>最近24小时批量BMPA过</span>

100
tests/Feature/AdminPlatformOrderIndexBatchActivationRunIdFilterShouldWorkTest.php Normal file
View File

@@ -0,0 +1,100 @@
<?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 AdminPlatformOrderIndexBatchActivationRunIdFilterShouldWorkTest 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_batch_activation_run_id(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'po_batch_activation_run_id_filter_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,
'order_no' => 'PO_RUN_ID_A_0001',
'order_type' => 'new_purchase',
'status' => 'activated',
'payment_status' => 'paid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 10,
'placed_at' => now()->subMinutes(10),
'paid_at' => now()->subMinutes(9),
'activated_at' => now()->subMinutes(8),
'meta' => [
'batch_activation' => [
'at' => now()->toDateTimeString(),
'admin_id' => 1,
'scope' => 'filtered',
'mode' => 'queue',
'run_id' => 'BAS_FILTER_0001',
],
],
]);
PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'order_no' => 'PO_RUN_ID_B_0002',
'order_type' => 'new_purchase',
'status' => 'activated',
'payment_status' => 'paid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 10,
'placed_at' => now()->subMinutes(7),
'paid_at' => now()->subMinutes(6),
'activated_at' => now()->subMinutes(5),
'meta' => [
'batch_activation' => [
'at' => now()->toDateTimeString(),
'admin_id' => 1,
'scope' => 'filtered',
'mode' => 'queue',
'run_id' => 'BAS_FILTER_0002',
],
],
]);
$this->get('/admin/platform-orders?batch_activation_run_id=BAS_FILTER_0001')
->assertOk()
->assertSee('PO_RUN_ID_A_0001')
->assertDontSee('PO_RUN_ID_B_0002');
}
}