linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform orders: batch activate guard renewal missing subscription

Browse Source
This commit is contained in:
萝卜
2026-03-15 05:44:09 +00:00
parent aee9026b98
commit a4c36ab868
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -1382,10 +1382,22 @@ class PlatformOrderController extends Controller
foreach ($orders as $orderRow) { foreach ($orders as $orderRow) {
try { try {
$order = PlatformOrder::query()->find($orderRow->id);
if (! $order) {
continue;
}
// 治理优先：续费单必须绑定订阅（兼容历史脏数据/手工改库等场景）
if ((string) ($order->order_type ?? '') === 'renewal' && ! (int) ($order->site_subscription_id ?? 0)) {
throw new \InvalidArgumentException('续费单未绑定订阅（site_subscription_id 为空），不允许批量同步订阅。');
}
$subscription = $service->activateOrder($orderRow->id, $admin->id); $subscription = $service->activateOrder($orderRow->id, $admin->id);
// 注意：activateOrder 过程中会写入 order 的 meta/site_subscription_id 等；此处必须 refresh，避免后续写审计时覆盖掉同步结果
$order->refresh();
// 轻量审计：记录批量同步动作（方便追溯） // 轻量审计：记录批量同步动作（方便追溯）
$order = PlatformOrder::query()->find($orderRow->id);
if ($order) { if ($order) {
$meta = (array) ($order->meta ?? []); $meta = (array) ($order->meta ?? []);
$audit = (array) (data_get($meta, 'audit', []) ?? []); $audit = (array) (data_get($meta, 'audit', []) ?? []);

10
tests/Feature/AdminPlatformOrderBatchActivateSubscriptionsTest.php
View File

@@ -110,7 +110,7 @@ class AdminPlatformOrderBatchActivateSubscriptionsTest extends TestCase
'merchant_id' => $merchant->id, 'merchant_id' => $merchant->id,
'plan_id' => $plan->id, 'plan_id' => $plan->id,
'order_no' => 'PO_BATCH_FAIL_0001', 'order_no' => 'PO_BATCH_FAIL_0001',
'order_type' => 'renewal', 'order_type' => 'new_purchase',
'status' => 'activated', 'status' => 'activated',
'payment_status' => 'paid', 'payment_status' => 'paid',
'plan_name' => $plan->name, 'plan_name' => $plan->name,
@@ -130,7 +130,7 @@ class AdminPlatformOrderBatchActivateSubscriptionsTest extends TestCase
'merchant_id' => $merchant->id, 'merchant_id' => $merchant->id,
'plan_id' => $plan->id, 'plan_id' => $plan->id,
'order_no' => 'PO_BATCH_FAIL_0002', 'order_no' => 'PO_BATCH_FAIL_0002',
'order_type' => 'renewal', 'order_type' => 'new_purchase',
'status' => 'activated', 'status' => 'activated',
'payment_status' => 'paid', 'payment_status' => 'paid',
'plan_name' => $plan->name, 'plan_name' => $plan->name,
@@ -203,7 +203,7 @@ class AdminPlatformOrderBatchActivateSubscriptionsTest extends TestCase
'merchant_id' => $merchant->id, 'merchant_id' => $merchant->id,
'plan_id' => $plan->id, 'plan_id' => $plan->id,
'order_no' => 'PO_BATCH_LIMIT_0001', 'order_no' => 'PO_BATCH_LIMIT_0001',
'order_type' => 'renewal', 'order_type' => 'new_purchase',
'status' => 'activated', 'status' => 'activated',
'payment_status' => 'paid', 'payment_status' => 'paid',
'plan_name' => $plan->name, 'plan_name' => $plan->name,
@@ -221,7 +221,7 @@ class AdminPlatformOrderBatchActivateSubscriptionsTest extends TestCase
'merchant_id' => $merchant->id, 'merchant_id' => $merchant->id,
'plan_id' => $plan->id, 'plan_id' => $plan->id,
'order_no' => 'PO_BATCH_LIMIT_0002', 'order_no' => 'PO_BATCH_LIMIT_0002',
'order_type' => 'renewal', 'order_type' => 'new_purchase',
'status' => 'activated', 'status' => 'activated',
'payment_status' => 'paid', 'payment_status' => 'paid',
'plan_name' => $plan->name, 'plan_name' => $plan->name,
@@ -239,7 +239,7 @@ class AdminPlatformOrderBatchActivateSubscriptionsTest extends TestCase
'merchant_id' => $merchant->id, 'merchant_id' => $merchant->id,
'plan_id' => $plan->id, 'plan_id' => $plan->id,
'order_no' => 'PO_BATCH_LIMIT_0003', 'order_no' => 'PO_BATCH_LIMIT_0003',
'order_type' => 'renewal', 'order_type' => 'new_purchase',
'status' => 'activated', 'status' => 'activated',
'payment_status' => 'paid', 'payment_status' => 'paid',
'plan_name' => $plan->name, 'plan_name' => $plan->name,