标记支付并生效:存在退款记录时阻断并提示先核对
This commit is contained in:
@@ -405,6 +405,11 @@ class PlatformOrderController extends Controller
|
|||||||
{
|
{
|
||||||
$admin = $this->ensurePlatformAdmin($request);
|
$admin = $this->ensurePlatformAdmin($request);
|
||||||
|
|
||||||
|
// 治理优先:若该订单已有退款轨迹(refund_summary/refund_receipts),不允许直接“标记支付并生效”,避免出现带退款的订单被强行推进并同步订阅
|
||||||
|
if ((float) $order->refundTotal() > 0) {
|
||||||
|
return redirect()->back()->with('warning', '当前订单已存在退款记录/退款汇总,请先核对退款轨迹与订单状态后再处理(不建议直接标记支付并生效)。');
|
||||||
|
}
|
||||||
|
|
||||||
// 最小状态推进:将订单标记为已支付 + 已生效,并补齐时间与金额字段
|
// 最小状态推进:将订单标记为已支付 + 已生效,并补齐时间与金额字段
|
||||||
$now = now();
|
$now = now();
|
||||||
$order->payment_status = 'paid';
|
$order->payment_status = 'paid';
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
<?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 AdminPlatformOrderMarkPaidAndActivateRefundSafetyValveTest 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_blocked_when_order_has_refund_records(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'mark_paid_refund_safety_valve_test',
|
||||||
|
'name' => '标记支付退款安全阀测试(月付)',
|
||||||
|
'billing_cycle' => 'monthly',
|
||||||
|
'price' => 30,
|
||||||
|
'list_price' => 30,
|
||||||
|
'status' => 'active',
|
||||||
|
'sort' => 10,
|
||||||
|
'published_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$order = PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'order_no' => 'PO_MARK_PAID_REFUND_BLOCK_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'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' => [
|
||||||
|
'refund_summary' => [
|
||||||
|
'count' => 1,
|
||||||
|
'total_amount' => 1.00,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$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);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user