From 18ce8cb06605e7772b3eff181825fa772d23c1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Tue, 10 Mar 2026 23:11:32 +0000 Subject: [PATCH] =?UTF-8?q?fix(platform-orders):=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=94=9F=E6=95=88/=E6=B8=85=E7=90=86=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E8=BF=87=E6=BB=A4=E5=AD=97=E6=AE=B5=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/PlatformOrderController.php | 12 +++ ...rderBatchMarkActivatedFilterFieldsTest.php | 100 ++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 tests/Feature/AdminPlatformOrderBatchMarkActivatedFilterFieldsTest.php diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 83529e2..555a95a 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -767,6 +767,10 @@ class PlatformOrderController extends Controller 'keyword' => trim((string) $request->input('keyword', '')), 'syncable_only' => (string) $request->input('syncable_only', ''), 'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''), + // 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径 + 'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''), + 'reconcile_mismatch' => (string) $request->input('reconcile_mismatch', ''), + 'receipt_status' => trim((string) $request->input('receipt_status', '')), ]; // 防误操作：批量同步默认要求先勾选“只看可同步”，避免无意识扩大处理范围 @@ -893,6 +897,10 @@ class PlatformOrderController extends Controller 'keyword' => trim((string) $request->input('keyword', '')), 'syncable_only' => (string) $request->input('syncable_only', ''), 'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''), + // 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径 + 'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''), + 'reconcile_mismatch' => (string) $request->input('reconcile_mismatch', ''), + 'receipt_status' => trim((string) $request->input('receipt_status', '')), ]; // 防误操作：批量“仅标记为已生效”默认要求当前筛选口径为「已支付 + 待处理(pending)」 @@ -992,6 +1000,10 @@ class PlatformOrderController extends Controller 'keyword' => trim((string) $request->input('keyword', '')), 'syncable_only' => (string) $request->input('syncable_only', ''), 'batch_synced_24h' => (string) $request->input('batch_synced_24h', ''), + // 与列表页筛选保持一致（可治理）：用于在批量操作后仍能回到同一口径 + 'batch_mark_activated_24h' => (string) $request->input('batch_mark_activated_24h', ''), + 'reconcile_mismatch' => (string) $request->input('reconcile_mismatch', ''), + 'receipt_status' => trim((string) $request->input('receipt_status', '')), ]; $query = PlatformOrder::query() diff --git a/tests/Feature/AdminPlatformOrderBatchMarkActivatedFilterFieldsTest.php b/tests/Feature/AdminPlatformOrderBatchMarkActivatedFilterFieldsTest.php new file mode 100644 index 0000000..b9252cc --- /dev/null +++ b/tests/Feature/AdminPlatformOrderBatchMarkActivatedFilterFieldsTest.php @@ -0,0 +1,100 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_batch_mark_activated_filtered_scope_respects_receipt_status_and_reconcile_mismatch_filters(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'batch_mark_activated_filter_fields_plan', + 'name' => '批量生效（筛选字段）测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 10, + 'list_price' => 10, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + // A：无回执 + 对账不一致（回执总额 0，但 paid_amount=10）=> reconcile_mismatch=1 命中 + $a = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_BMA_FILTER_A', + 'order_type' => 'new_purchase', + 'status' => 'pending', + '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(), + 'paid_at' => now(), + 'meta' => [], + ]); + + // B：有回执（summary=10）+ 对账一致 => reconcile_mismatch=1 不应命中 + $b = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_BMA_FILTER_B', + 'order_type' => 'new_purchase', + 'status' => 'pending', + '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(), + 'paid_at' => now(), + 'meta' => [ + 'payment_summary' => [ + 'total_amount' => 10.00, + 'count' => 1, + ], + ], + ]); + + // 批量生效：过滤条件=已支付+待处理 + 无回执 + 对账不一致，只应推进 A + $this->post('/admin/platform-orders/batch-mark-activated', [ + 'scope' => 'filtered', + 'payment_status' => 'paid', + 'status' => 'pending', + 'receipt_status' => 'none', + 'reconcile_mismatch' => '1', + 'limit' => 50, + ])->assertRedirect(); + + $a->refresh(); + $b->refresh(); + + $this->assertSame('activated', $a->status); + $this->assertSame('pending', $b->status); + } +}