diff --git a/app/Http/Controllers/Admin/SiteSubscriptionController.php b/app/Http/Controllers/Admin/SiteSubscriptionController.php index 157a53d..79a7aa9 100644 --- a/app/Http/Controllers/Admin/SiteSubscriptionController.php +++ b/app/Http/Controllers/Admin/SiteSubscriptionController.php @@ -384,6 +384,43 @@ class SiteSubscriptionController extends Controller return redirect()->back()->with('success', '订阅状态已更新：' . ($this->statusLabels()[$subscription->status] ?? $subscription->status)); } + public function batchMarkExpired(Request $request): \Illuminate\Http\RedirectResponse + { + $this->ensurePlatformAdmin($request); + + // 仅支持在“已过期（expiry=expired）集合”上执行，避免误把正常订阅批量标记为已过期。 + $filters = [ + 'status' => trim((string) $request->input('status', '')), + 'keyword' => trim((string) $request->input('keyword', '')), + 'merchant_id' => trim((string) $request->input('merchant_id', '')), + 'plan_id' => trim((string) $request->input('plan_id', '')), + 'expiry' => trim((string) $request->input('expiry', '')), + ]; + + if ((string) ($filters['expiry'] ?? '') !== 'expired') { + return redirect()->back()->with('warning', '为避免误操作：批量标记已过期仅允许在「已过期（expiry=expired）」集合视图下执行。'); + } + + // 防误操作：需要二次确认 + if ((string) $request->input('confirm', '') !== 'YES') { + return redirect()->back()->with('warning', '为避免误操作，请在确认框输入 YES 后再批量标记已过期。'); + } + + $query = $this->applyFilters(SiteSubscription::query(), $filters); + + // 再加一道硬条件：ends_at 必须 < now（与 expiry=expired 一致） + $query->whereNotNull('ends_at')->where('ends_at', '<', now()); + + // 仅把“非已过期”的订阅更新为 expired + $affected = (clone $query) + ->where('status', '!=', 'expired') + ->update([ + 'status' => 'expired', + ]); + + return redirect()->back()->with('success', '已批量标记已过期：' . (int) $affected . ' 条。'); + } + protected function applyFilters(Builder $query, array $filters): Builder { return $query diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index ce4a14e..d78ea45 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -237,6 +237,12 @@

工具

+ + @php + $batchMarkExpiredEnabled = (string) ($filters['expiry'] ?? '') === 'expired'; + $batchMarkExpiredReason = $batchMarkExpiredEnabled ? '' : '请先进入「已过期（expiry=expired）」集合后再执行批量标记。'; + @endphp +
@@ -264,6 +270,28 @@ @if(!($isExpiryView ?? false) && $attachOrderId <= 0) 续费下单（先选订阅） @endif + + + @csrf + + + + + + + + +
+ + @if(! $batchMarkExpiredEnabled) +
提示：{{ $batchMarkExpiredReason }}
+ @endif +
+
@if($attachOrderId > 0) diff --git a/routes/web.php b/routes/web.php index 9143165..7b651ae 100644 --- a/routes/web.php +++ b/routes/web.php @@ -138,6 +138,7 @@ Route::prefix('admin')->group(function () { Route::get('/site-subscriptions/export', [SiteSubscriptionController::class, 'export']); Route::get('/site-subscriptions/{subscription}', [SiteSubscriptionController::class, 'show']); Route::post('/site-subscriptions/{subscription}/set-status', [SiteSubscriptionController::class, 'setStatus']); + Route::post('/site-subscriptions/batch-mark-expired', [SiteSubscriptionController::class, 'batchMarkExpired']); Route::get('/plans', [PlanController::class, 'index']); Route::get('/plans/export', [PlanController::class, 'export']); diff --git a/tests/Feature/AdminSiteSubscriptionSyncFailedReasonLongDoesNotRenderKeywordLinkTest.php b/tests/Feature/AdminSiteSubscriptionSyncFailedReasonLongDoesNotRenderKeywordLinkTest.php index 80c8e6b..ab65858 100644 --- a/tests/Feature/AdminSiteSubscriptionSyncFailedReasonLongDoesNotRenderKeywordLinkTest.php +++ b/tests/Feature/AdminSiteSubscriptionSyncFailedReasonLongDoesNotRenderKeywordLinkTest.php @@ -54,7 +54,8 @@ class AdminSiteSubscriptionSyncFailedReasonLongDoesNotRenderKeywordLinkTest exte 'activated_at' => now()->subDay(), ]); - $longReason = str_repeat('错', 120); + // 超过 config('saasshop.platform_orders.sync_error_keyword_link_max_len', 200) + $longReason = str_repeat('错', 220); PlatformOrder::query()->create([ 'merchant_id' => $merchant->id, diff --git a/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldBlockWhenNotExpiredScopeTest.php b/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldBlockWhenNotExpiredScopeTest.php new file mode 100644 index 0000000..c81d8c2 --- /dev/null +++ b/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldBlockWhenNotExpiredScopeTest.php @@ -0,0 +1,104 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_batch_mark_expired_should_block_when_expiry_not_expired(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'sub_batch_mark_expired_block_scope_plan', + 'name' => '订阅批量标记过期阻断（scope）测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 1, + 'list_price' => 1, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $sub = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'activated', + 'source' => 'manual', + 'subscription_no' => 'SUB_BATCH_EXPIRED_BLOCK_SCOPE_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 1, + 'starts_at' => now()->subDay(), + 'ends_at' => now()->addDays(5), + 'activated_at' => now()->subDay(), + ]); + + $this->post('/admin/site-subscriptions/batch-mark-expired', [ + 'expiry' => 'expiring_7d', + 'confirm' => 'YES', + ])->assertRedirect()->assertSessionHas('warning'); + + $sub->refresh(); + $this->assertSame('activated', (string) $sub->status); + } + + public function test_batch_mark_expired_should_block_when_confirm_missing(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'sub_batch_mark_expired_block_confirm_plan', + 'name' => '订阅批量标记过期阻断（confirm）测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 1, + 'list_price' => 1, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $sub = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'activated', + 'source' => 'manual', + 'subscription_no' => 'SUB_BATCH_EXPIRED_BLOCK_CONFIRM_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 1, + 'starts_at' => now()->subDay(), + 'ends_at' => now()->subDays(1), + 'activated_at' => now()->subDay(), + ]); + + $this->post('/admin/site-subscriptions/batch-mark-expired', [ + 'expiry' => 'expired', + 'confirm' => '', + ])->assertRedirect()->assertSessionHas('warning'); + + $sub->refresh(); + $this->assertSame('activated', (string) $sub->status); + } +} diff --git a/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldMarkExpiredOnlyWhenEndsAtPastTest.php b/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldMarkExpiredOnlyWhenEndsAtPastTest.php new file mode 100644 index 0000000..1d8248f --- /dev/null +++ b/tests/Feature/AdminSiteSubscriptionsBatchMarkExpiredShouldMarkExpiredOnlyWhenEndsAtPastTest.php @@ -0,0 +1,99 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_batch_mark_expired_should_only_update_subscriptions_with_ends_at_past(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'sub_batch_mark_expired_success_plan', + 'name' => '订阅批量标记过期（成功）测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 1, + 'list_price' => 1, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $expiredA = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'activated', + 'source' => 'manual', + 'subscription_no' => 'SUB_BATCH_EXPIRED_OK_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 1, + 'starts_at' => now()->subDays(40), + 'ends_at' => now()->subDays(1), + 'activated_at' => now()->subDays(40), + ]); + + $expiredAlready = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'expired', + 'source' => 'manual', + 'subscription_no' => 'SUB_BATCH_EXPIRED_ALREADY_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 1, + 'starts_at' => now()->subDays(70), + 'ends_at' => now()->subDays(10), + 'activated_at' => now()->subDays(70), + ]); + + $notExpired = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'activated', + 'source' => 'manual', + 'subscription_no' => 'SUB_BATCH_EXPIRED_SKIP_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 1, + 'starts_at' => now()->subDays(5), + 'ends_at' => now()->addDays(5), + 'activated_at' => now()->subDays(5), + ]); + + $this->post('/admin/site-subscriptions/batch-mark-expired', [ + 'expiry' => 'expired', + 'confirm' => 'YES', + ])->assertRedirect()->assertSessionHas('success'); + + $expiredA->refresh(); + $expiredAlready->refresh(); + $notExpired->refresh(); + + $this->assertSame('expired', (string) $expiredA->status); + $this->assertSame('expired', (string) $expiredAlready->status); + $this->assertSame('activated', (string) $notExpired->status); + } +}