xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 支持开奖设置走系统配置并补充相关测试

Browse Source
This commit is contained in:
kang
2026-05-20 13:54:32 +08:00
parent 5742853c4c
commit 2753590685
4 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/Draw/DrawPublishService.php
View File

@@ -7,6 +7,7 @@ use App\Models\AdminUser;
use App\Lottery\DrawStatus;
use App\Models\DrawResultBatch;
use Illuminate\Support\Facades\DB;
use App\Services\LotterySettings;
use App\Lottery\DrawResultBatchStatus;
/**
@@ -67,7 +68,10 @@ final class DrawPublishService
private function applyPublishedToDraw(Draw $draw, DrawResultBatch $batch): Draw
{
$cooldownMinutes = (int) config('lottery.draw.cooldown_minutes', 15);
$cooldownMinutes = max(0, (int) LotterySettings::get(
'draw.cooldown_minutes',
(int) config('lottery.draw.cooldown_minutes', 15),
));
if ($cooldownMinutes > 0) {
$draw->forceFill([
'status' => DrawStatus::Cooldown->value,

6
app/Services/Draw/DrawRngRunner.php
View File

@@ -8,6 +8,7 @@ use App\Lottery\DrawStatus;
use App\Models\DrawResultItem;
use App\Models\DrawResultBatch;
use Illuminate\Support\Facades\DB;
use App\Services\LotterySettings;
use App\Lottery\DrawResultSourceType;
use App\Lottery\DrawResultBatchStatus;
@@ -27,7 +28,10 @@ final class DrawRngRunner
'status' => DrawStatus::Drawing->value,
])->save();
$manualReview = (bool) config('lottery.draw.require_manual_review', false);
$manualReview = (bool) LotterySettings::get(
'draw.require_manual_review',
(bool) config('lottery.draw.require_manual_review', false),
);
$seedMaterial = bin2hex(random_bytes(32));
$rngSeedHash = hash('sha256', $seedMaterial);

14
database/seeders/LotterySettingsSeeder.php
View File

@@ -61,6 +61,20 @@ final class LotterySettingsSeeder extends Seeder
'客户端展示用短名称（示例）',
);
LotterySettings::put(
'draw.require_manual_review',
false,
'draw',
'RNG 开奖后是否必须进入人工审核；false 时系统直接发布结果',
);
LotterySettings::put(
'draw.cooldown_minutes',
15,
'draw',
'开奖结果发布后的冷静期分钟数；0 表示直接进入结算态',
);
LotterySettings::put(
'settlement.auto_run_on_tick',
true,

44
tests/Feature/DrawPipelineTest.php
View File

@@ -10,6 +10,7 @@ use App\Models\DrawResultBatch;
use App\Models\SettlementBatch;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Event;
use App\Services\LotterySettings;
use App\Events\DrawCountdownBroadcast;
use App\Lottery\DrawResultBatchStatus;
use App\Services\Draw\DrawTickService;
@@ -225,6 +226,7 @@ test('draw tick moves open draw to closing when close_time passed before draw_ti
test('draw tick rng publishes result when manual review disabled', function (): void {
config(['lottery.draw.require_manual_review' => false]);
LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
Carbon::setTestNow(Carbon::parse('2026-05-09 14:05:00', 'UTC'));
$drawTime = now()->copy()->subMinute();
@@ -261,6 +263,7 @@ test('draw tick rng publishes result when manual review disabled', function ():
test('draw tick rng awaits manual publish when review enabled', function (): void {
config(['lottery.draw.require_manual_review' => true]);
LotterySettings::put('draw.require_manual_review', true, 'draw', 'RNG 开奖后是否必须进入人工审核');
Carbon::setTestNow(Carbon::parse('2026-05-09 14:06:00', 'UTC'));
$drawTime = now()->copy()->subMinute();
@@ -513,6 +516,8 @@ test('cooldown expiry tick moves draw to settling', function (): void {
'lottery.draw.require_manual_review' => false,
'lottery.draw.cooldown_minutes' => 15,
]);
LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
LotterySettings::put('draw.cooldown_minutes', 15, 'draw', '开奖结果发布后的冷静期分钟数');
Carbon::setTestNow(Carbon::parse('2026-05-09 14:07:00', 'UTC'));
$drawTime = now()->copy()->subMinute();
@@ -549,6 +554,45 @@ test('cooldown expiry tick moves draw to settling', function (): void {
Carbon::setTestNow();
});
test('draw tick uses lottery settings to bypass manual review and cooldown', function (): void {
config([
'lottery.draw.require_manual_review' => true,
'lottery.draw.cooldown_minutes' => 15,
]);
LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
LotterySettings::put('draw.cooldown_minutes', 0, 'draw', '开奖结果发布后的冷静期分钟数');
Carbon::setTestNow(Carbon::parse('2026-05-09 14:08:00', 'UTC'));
$drawTime = now()->copy()->subMinute();
$closeTime = $drawTime->copy()->subSeconds(30);
Draw::query()->create([
'draw_no' => '20260509-778',
'business_date' => '2026-05-09',
'sequence_no' => 778,
'status' => DrawStatus::Open->value,
'start_time' => $closeTime->copy()->subMinutes(10),
'close_time' => $closeTime,
'draw_time' => $drawTime,
'cooling_end_time' => null,
'result_source' => null,
'current_result_version' => 0,
'settle_version' => 0,
'is_reopened' => false,
]);
app(DrawTickService::class)->tick(now()->utc());
$draw = Draw::query()->where('draw_no', '20260509-778')->firstOrFail();
expect($draw->status)->toBe(DrawStatus::Settling->value);
expect($draw->cooling_end_time)->toBeNull();
$batch = DrawResultBatch::query()->where('draw_id', $draw->id)->firstOrFail();
expect($batch->status)->toBe(DrawResultBatchStatus::Published->value);
Carbon::setTestNow();
});
test('GET draw current returns open draw with seconds to close', function (): void {
Carbon::setTestNow(Carbon::parse('2026-05-09 15:00:00', 'UTC'));