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');