标记支付并生效:续费单必须绑定订阅(安全阀)并新增测试

This commit is contained in:
萝卜
2026-03-15 04:42:37 +00:00
parent c75e7ad7d6
commit c4c91ebf14
2 changed files with 73 additions and 0 deletions

View File

@@ -684,6 +684,11 @@ class PlatformOrderController extends Controller
{ {
$admin = $this->ensurePlatformAdmin($request); $admin = $this->ensurePlatformAdmin($request);
// 治理优先:续费单必须绑定订阅(兼容历史脏数据/手工改库等场景)
if ((string) ($order->order_type ?? '') === 'renewal' && ! (int) ($order->site_subscription_id ?? 0)) {
return redirect()->back()->with('warning', '当前订单类型为「续费」但未绑定订阅site_subscription_id 为空)。为避免误同步/续期串单,请先补齐订阅关联后再处理。');
}
// 治理优先若该订单已有退款轨迹refund_summary/refund_receipts不允许直接“标记支付并生效”避免出现带退款的订单被强行推进并同步订阅 // 治理优先若该订单已有退款轨迹refund_summary/refund_receipts不允许直接“标记支付并生效”避免出现带退款的订单被强行推进并同步订阅
if ((float) $order->refundTotal() > 0) { if ((float) $order->refundTotal() > 0) {
return redirect()->back()->with('warning', '当前订单已存在退款记录/退款汇总,请先核对退款轨迹与订单状态后再处理(不建议直接标记支付并生效)。'); return redirect()->back()->with('warning', '当前订单已存在退款记录/退款汇总,请先核对退款轨迹与订单状态后再处理(不建议直接标记支付并生效)。');

View File

@@ -0,0 +1,68 @@
<?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 AdminPlatformOrderMarkPaidAndActivateRenewalShouldRequireSubscriptionGuardTest 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_mark_paid_and_activate_should_be_blocked_when_order_is_renewal_but_subscription_missing(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'mark_paid_renewal_requires_sub_guard_plan',
'name' => '标记支付续费必须绑订阅安全阀测试套餐',
'billing_cycle' => 'monthly',
'price' => 30,
'list_price' => 30,
'status' => 'active',
'sort' => 10,
'published_at' => now(),
]);
// 人为构造“脏数据”renewal 但 site_subscription_id 为空
$order = PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'order_no' => 'PO_MARK_PAID_RENEWAL_NO_SUB_0001',
'order_type' => 'renewal',
'status' => 'pending',
'payment_status' => 'unpaid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 30,
'paid_amount' => 0,
'placed_at' => now(),
'meta' => [],
]);
$res = $this->post('/admin/platform-orders/' . $order->id . '/mark-paid-and-activate');
$res->assertRedirect();
$res->assertSessionHas('warning');
$order->refresh();
$this->assertSame('unpaid', $order->payment_status);
$this->assertSame('pending', $order->status);
$this->assertNull($order->site_subscription_id);
}
}