feat(core): harden sessions settlement and credit activity
Some checks failed
lotterLaravel CI / test (push) Has been cancelled
lotterLaravel E2E / e2e-api (push) Has been cancelled

This commit is contained in:
wchino
2026-07-22 20:53:43 +08:00
parent 35f6e46958
commit 15bd997c4e
48 changed files with 1920 additions and 93 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Services\Settlement;
use App\Services\AuditLogger;
use Illuminate\Support\Carbon;
use App\Models\SettlementBatch;
use App\Services\LotterySettings;
use Illuminate\Support\Facades\DB;
@@ -23,19 +24,21 @@ final class SettlementTickFinalizer
$approved = 0;
$paid = 0;
$payoutFailed = 0;
$finalizeLimit = (int) config('lottery.draw_tick_finalize_limit', 5);
$autoApprove = (bool) LotterySettings::get('settlement.auto_approve_on_tick', true);
$pending = $autoApprove
? SettlementBatch::query()
->where('status', SettlementBatchStatus::PendingReview->value)
->orderBy('id')
->limit((int) config('lottery.draw_tick_finalize_limit', 5))
->limit($finalizeLimit)
->get()
: collect();
// 除本轮待审核批次外,也恢复处理上轮已批准但尚未派彩的批次。
// 这样进程即使在 approve 提交后、payout 开始前退出,下一 tick 仍能续跑。
$approvedDrawIds = DB::table('settlement_batches as approved')
$retryBaseSeconds = (int) config('lottery.auto_payout_retry_base_seconds', 60);
$approvedDrawCandidates = DB::table('settlement_batches as approved')
->where('approved.status', SettlementBatchStatus::Approved->value)
->whereNotExists(function ($query): void {
$query->selectRaw('1')
@@ -47,10 +50,21 @@ final class SettlementTickFinalizer
]);
})
->groupBy('approved.draw_id')
->selectRaw('approved.draw_id, MAX(approved.auto_payout_attempts) AS max_auto_payout_attempts, MAX(approved.updated_at) AS last_attempt_at')
->havingRaw(
'(MAX(approved.auto_payout_attempts) = 0 OR MAX(approved.updated_at) <= ?)',
[now()->subSeconds($retryBaseSeconds)],
)
->orderByRaw('MAX(approved.auto_payout_attempts)')
->orderByRaw('MIN(approved.id)')
->limit((int) config('lottery.draw_tick_finalize_limit', 5))
->pluck('approved.draw_id');
->cursor();
$approvedDrawIds = $approvedDrawCandidates
->filter(fn (object $candidate): bool => $this->autoPayoutRetryIsDue(
(int) $candidate->max_auto_payout_attempts,
$candidate->last_attempt_at !== null ? (string) $candidate->last_attempt_at : null,
))
->take($finalizeLimit)
->pluck('draw_id');
$candidateDrawIds = $pending->pluck('draw_id')
->merge($approvedDrawIds)
->map(fn ($id): int => (int) $id)
@@ -139,4 +153,20 @@ final class SettlementTickFinalizer
);
});
}
private function autoPayoutRetryIsDue(int $attempts, ?string $lastAttemptAt): bool
{
if ($attempts <= 0 || $lastAttemptAt === null) {
return true;
}
$baseSeconds = (int) config('lottery.auto_payout_retry_base_seconds', 60);
$maxSeconds = max($baseSeconds, (int) config('lottery.auto_payout_retry_max_seconds', 3600));
$exponent = min($attempts - 1, 20);
$delaySeconds = min($maxSeconds, $baseSeconds * (2 ** $exponent));
return now()->greaterThanOrEqualTo(
Carbon::parse($lastAttemptAt)->addSeconds($delaySeconds),
);
}
}