diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index bc490e0..8f4861e 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -29,6 +29,7 @@ class PlatformOrderController extends Controller 'fail_only' => (string) $request->query('fail_only', ''), 'synced_only' => (string) $request->query('synced_only', ''), 'sync_status' => trim((string) $request->query('sync_status', '')), + 'keyword' => trim((string) $request->query('keyword', '')), // 只看“可同步订阅”的订单:已支付 + 已生效 + 未同步(用于运营快速处理) 'syncable_only' => (string) $request->query('syncable_only', ''), // 只看最近 24 小时批量同步过的订单(可治理追踪) @@ -221,6 +222,7 @@ class PlatformOrderController extends Controller 'fail_only' => (string) $request->query('fail_only', ''), 'synced_only' => (string) $request->query('synced_only', ''), 'sync_status' => trim((string) $request->query('sync_status', '')), + 'keyword' => trim((string) $request->query('keyword', '')), // 只看“可同步订阅”的订单:已支付 + 已生效 + 未同步(用于运营快速处理) 'syncable_only' => (string) $request->query('syncable_only', ''), // 只看最近 24 小时批量同步过的订单(可治理追踪) @@ -334,6 +336,7 @@ class PlatformOrderController extends Controller 'fail_only' => (string) $request->input('fail_only', ''), 'synced_only' => (string) $request->input('synced_only', ''), 'sync_status' => trim((string) $request->input('sync_status', '')), + 'keyword' => trim((string) $request->input('keyword', '')), 'syncable_only' => (string) $request->input('syncable_only', ''), 'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''), ]; @@ -458,6 +461,7 @@ class PlatformOrderController extends Controller 'fail_only' => (string) $request->input('fail_only', ''), 'synced_only' => (string) $request->input('synced_only', ''), 'sync_status' => trim((string) $request->input('sync_status', '')), + 'keyword' => trim((string) $request->input('keyword', '')), 'syncable_only' => (string) $request->input('syncable_only', ''), 'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''), ]; @@ -530,6 +534,30 @@ class PlatformOrderController extends Controller ->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL"); } }) + ->when(($filters['keyword'] ?? '') !== '', function (Builder $builder) use ($filters) { + // 关键词搜索:订单号 / 站点名称 / 订阅号 + $kw = trim((string) ($filters['keyword'] ?? '')); + if ($kw === '') { + return; + } + + $builder->where(function (Builder $q) use ($kw) { + $q->where('order_no', 'like', '%' . $kw . '%') + ->orWhere('order_type', 'like', '%' . $kw . '%') + ->orWhere('plan_name', 'like', '%' . $kw . '%') + ->orWhereHas('merchant', function (Builder $mq) use ($kw) { + $mq->where('name', 'like', '%' . $kw . '%') + ->orWhere('slug', 'like', '%' . $kw . '%'); + }) + ->orWhereHas('siteSubscription', function (Builder $sq) use ($kw) { + $sq->where('subscription_no', 'like', '%' . $kw . '%'); + }); + + if (ctype_digit($kw)) { + $q->orWhere('id', (int) $kw); + } + }); + }) ->when(($filters['syncable_only'] ?? '') !== '', function (Builder $builder) { // 只看可同步:已支付 + 已生效 + 尚未写入 subscription_activation.subscription_id $builder->where('payment_status', 'paid') diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index dbf4c46..4f2f992 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -46,6 +46,7 @@ 最近24小时批量同步过 +
@@ -106,6 +107,7 @@ +