feat(platform-orders): 新增退款轨迹筛选 refund_status(含UI/导出/批量透传/测试)
This commit is contained in:
@@ -140,6 +140,8 @@ class PlatformOrderController extends Controller
|
||||
'reconcile_mismatch' => (string) $request->query('reconcile_mismatch', ''),
|
||||
// 支付回执筛选:has(有回执)/none(无回执)
|
||||
'receipt_status' => trim((string) $request->query('receipt_status', '')),
|
||||
// 退款轨迹筛选:has(有退款)/none(无退款)
|
||||
'refund_status' => trim((string) $request->query('refund_status', '')),
|
||||
];
|
||||
|
||||
|
||||
@@ -591,6 +593,8 @@ class PlatformOrderController extends Controller
|
||||
'reconcile_mismatch' => (string) $request->query('reconcile_mismatch', ''),
|
||||
// 支付回执筛选:has(有回执)/none(无回执)
|
||||
'receipt_status' => trim((string) $request->query('receipt_status', '')),
|
||||
// 退款轨迹筛选:has(有退款)/none(无退款)
|
||||
'refund_status' => trim((string) $request->query('refund_status', '')),
|
||||
];
|
||||
|
||||
|
||||
@@ -771,6 +775,7 @@ class PlatformOrderController extends Controller
|
||||
'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', '')),
|
||||
'refund_status' => trim((string) $request->input('refund_status', '')),
|
||||
];
|
||||
|
||||
// 防误操作:批量同步默认要求先勾选“只看可同步”,避免无意识扩大处理范围
|
||||
@@ -901,6 +906,7 @@ class PlatformOrderController extends Controller
|
||||
'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', '')),
|
||||
'refund_status' => trim((string) $request->input('refund_status', '')),
|
||||
];
|
||||
|
||||
// 防误操作:批量“仅标记为已生效”默认要求当前筛选口径为「已支付 + 待处理(pending)」
|
||||
@@ -1009,6 +1015,7 @@ class PlatformOrderController extends Controller
|
||||
'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', '')),
|
||||
'refund_status' => trim((string) $request->input('refund_status', '')),
|
||||
];
|
||||
|
||||
$query = PlatformOrder::query()
|
||||
@@ -1168,6 +1175,22 @@ class PlatformOrderController extends Controller
|
||||
$builder->whereRaw("JSON_EXTRACT(meta, '$.payment_summary.total_amount') IS NULL")
|
||||
->whereRaw("JSON_EXTRACT(meta, '$.payment_receipts[0].amount') IS NULL");
|
||||
}
|
||||
})
|
||||
->when(($filters['refund_status'] ?? '') !== '', function (Builder $builder) use ($filters) {
|
||||
// 退款轨迹筛选:
|
||||
// - has:有退款(refund_summary.total_amount 存在 或 refund_receipts[0].amount 存在)
|
||||
// - none:无退款(两者都不存在)
|
||||
$status = (string) ($filters['refund_status'] ?? '');
|
||||
|
||||
if ($status === 'has') {
|
||||
$builder->where(function (Builder $q) {
|
||||
$q->whereRaw("JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NOT NULL")
|
||||
->orWhereRaw("JSON_EXTRACT(meta, '$.refund_receipts[0].amount') IS NOT NULL");
|
||||
});
|
||||
} elseif ($status === 'none') {
|
||||
$builder->whereRaw("JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NULL")
|
||||
->whereRaw("JSON_EXTRACT(meta, '$.refund_receipts[0].amount') IS NULL");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,10 @@
|
||||
<span class="muted">|</span>
|
||||
<a href="/admin/platform-orders?receipt_status=none" class="muted">无回执</a>
|
||||
<span class="muted">|</span>
|
||||
<a href="/admin/platform-orders?refund_status=has" class="muted">有退款</a>
|
||||
<span class="muted">|</span>
|
||||
<a href="/admin/platform-orders?refund_status=none" class="muted">无退款</a>
|
||||
<span class="muted">|</span>
|
||||
<a href="/admin/platform-orders?reconcile_mismatch=1" class="muted">对账不一致</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -71,6 +75,11 @@
|
||||
<option value="has" @selected(($filters['receipt_status'] ?? '') === 'has')>有回执</option>
|
||||
<option value="none" @selected(($filters['receipt_status'] ?? '') === 'none')>无回执</option>
|
||||
</select>
|
||||
<select name="refund_status">
|
||||
<option value="">全部退款状态</option>
|
||||
<option value="has" @selected(($filters['refund_status'] ?? '') === 'has')>有退款</option>
|
||||
<option value="none" @selected(($filters['refund_status'] ?? '') === 'none')>无退款</option>
|
||||
</select>
|
||||
|
||||
<input type="number" name="site_subscription_id" placeholder="订阅ID(可选)" value="{{ $filters['site_subscription_id'] ?? '' }}" class="w-140">
|
||||
<label class="form-inline-row">
|
||||
@@ -196,6 +205,7 @@
|
||||
<input type="hidden" name="synced_only" value="{{ $filters['synced_only'] ?? '' }}">
|
||||
<input type="hidden" name="sync_status" value="{{ $filters['sync_status'] ?? '' }}">
|
||||
<input type="hidden" name="receipt_status" value="{{ $filters['receipt_status'] ?? '' }}">
|
||||
<input type="hidden" name="refund_status" value="{{ $filters['refund_status'] ?? '' }}">
|
||||
<input type="hidden" name="syncable_only" value="{{ $filters['syncable_only'] ?? '' }}">
|
||||
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
|
||||
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
|
||||
@@ -222,6 +232,7 @@
|
||||
<input type="hidden" name="synced_only" value="{{ $filters['synced_only'] ?? '' }}">
|
||||
<input type="hidden" name="sync_status" value="{{ $filters['sync_status'] ?? '' }}">
|
||||
<input type="hidden" name="receipt_status" value="{{ $filters['receipt_status'] ?? '' }}">
|
||||
<input type="hidden" name="refund_status" value="{{ $filters['refund_status'] ?? '' }}">
|
||||
<input type="hidden" name="syncable_only" value="{{ $filters['syncable_only'] ?? '' }}">
|
||||
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
|
||||
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
|
||||
@@ -250,6 +261,7 @@
|
||||
<input type="hidden" name="synced_only" value="{{ $filters['synced_only'] ?? '' }}">
|
||||
<input type="hidden" name="sync_status" value="{{ $filters['sync_status'] ?? '' }}">
|
||||
<input type="hidden" name="receipt_status" value="{{ $filters['receipt_status'] ?? '' }}">
|
||||
<input type="hidden" name="refund_status" value="{{ $filters['refund_status'] ?? '' }}">
|
||||
<input type="hidden" name="syncable_only" value="{{ $filters['syncable_only'] ?? '' }}">
|
||||
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
|
||||
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
|
||||
@@ -280,6 +292,7 @@
|
||||
<input type="hidden" name="synced_only" value="{{ $filters['synced_only'] ?? '' }}">
|
||||
<input type="hidden" name="sync_status" value="{{ $filters['sync_status'] ?? '' }}">
|
||||
<input type="hidden" name="receipt_status" value="{{ $filters['receipt_status'] ?? '' }}">
|
||||
<input type="hidden" name="refund_status" value="{{ $filters['refund_status'] ?? '' }}">
|
||||
<input type="hidden" name="syncable_only" value="{{ $filters['syncable_only'] ?? '' }}">
|
||||
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
|
||||
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
|
||||
@@ -324,6 +337,7 @@
|
||||
<input type="hidden" name="synced_only" value="{{ $filters['synced_only'] ?? '' }}">
|
||||
<input type="hidden" name="sync_status" value="{{ $filters['sync_status'] ?? '' }}">
|
||||
<input type="hidden" name="receipt_status" value="{{ $filters['receipt_status'] ?? '' }}">
|
||||
<input type="hidden" name="refund_status" value="{{ $filters['refund_status'] ?? '' }}">
|
||||
<input type="hidden" name="syncable_only" value="{{ $filters['syncable_only'] ?? '' }}">
|
||||
<input type="hidden" name="batch_synced_24h" value="{{ $filters['batch_synced_24h'] ?? '' }}">
|
||||
<input type="hidden" name="batch_mark_activated_24h" value="{{ $filters['batch_mark_activated_24h'] ?? '' }}">
|
||||
|
||||
122
tests/Feature/AdminPlatformOrderRefundStatusFilterTest.php
Normal file
122
tests/Feature/AdminPlatformOrderRefundStatusFilterTest.php
Normal file
@@ -0,0 +1,122 @@
|
||||
<?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 AdminPlatformOrderRefundStatusFilterTest 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_platform_orders_page_can_filter_by_refund_status_has_and_none(): void
|
||||
{
|
||||
$this->loginAsPlatformAdmin();
|
||||
|
||||
$merchant = Merchant::query()->firstOrFail();
|
||||
$plan = Plan::query()->create([
|
||||
'code' => 'refund_status_filter_test',
|
||||
'name' => '退款状态筛选测试套餐',
|
||||
'billing_cycle' => 'monthly',
|
||||
'price' => 10,
|
||||
'list_price' => 10,
|
||||
'status' => 'active',
|
||||
'sort' => 10,
|
||||
'published_at' => now(),
|
||||
]);
|
||||
|
||||
// 有退款:仅 refund_receipts
|
||||
PlatformOrder::query()->create([
|
||||
'merchant_id' => $merchant->id,
|
||||
'plan_id' => $plan->id,
|
||||
'order_no' => 'PO_REFUND_HAS_0001',
|
||||
'order_type' => 'new_purchase',
|
||||
'status' => 'activated',
|
||||
'payment_status' => 'partially_refunded',
|
||||
'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(),
|
||||
'activated_at' => now(),
|
||||
'meta' => [
|
||||
'refund_receipts' => [
|
||||
['amount' => 1.00, 'refunded_at' => now()->toDateTimeString()],
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
// 有退款:refund_summary
|
||||
PlatformOrder::query()->create([
|
||||
'merchant_id' => $merchant->id,
|
||||
'plan_id' => $plan->id,
|
||||
'order_no' => 'PO_REFUND_HAS_0002',
|
||||
'order_type' => 'new_purchase',
|
||||
'status' => 'activated',
|
||||
'payment_status' => 'refunded',
|
||||
'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(),
|
||||
'activated_at' => now(),
|
||||
'meta' => [
|
||||
'refund_summary' => [
|
||||
'total_amount' => 10.00,
|
||||
'count' => 1,
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
// 无退款:两者都没有
|
||||
PlatformOrder::query()->create([
|
||||
'merchant_id' => $merchant->id,
|
||||
'plan_id' => $plan->id,
|
||||
'order_no' => 'PO_REFUND_NONE_0003',
|
||||
'order_type' => 'new_purchase',
|
||||
'status' => 'activated',
|
||||
'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(),
|
||||
'activated_at' => now(),
|
||||
'meta' => [],
|
||||
]);
|
||||
|
||||
$this->get('/admin/platform-orders?refund_status=has')
|
||||
->assertOk()
|
||||
->assertSee('PO_REFUND_HAS_0001')
|
||||
->assertSee('PO_REFUND_HAS_0002')
|
||||
->assertDontSee('PO_REFUND_NONE_0003');
|
||||
|
||||
$this->get('/admin/platform-orders?refund_status=none')
|
||||
->assertOk()
|
||||
->assertSee('PO_REFUND_NONE_0003')
|
||||
->assertDontSee('PO_REFUND_HAS_0001')
|
||||
->assertDontSee('PO_REFUND_HAS_0002');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user