feat: 重构注单控制器以复用共享筛选逻辑

新增 TicketItemListFilters trait,用于封装注单列表的通用筛选逻辑。
更新 AdminPlayerTicketItemsIndexController、AdminTicketItemIndexController 与 TicketItemsIndexController,统一使用新的注单编号搜索与订单日期范围筛选方法,提升代码复用性与可读性。
增强 AdminRiskPoolManualStatusController:支持发布手动停售状态变更通知。
优化 RiskPoolService 与 TicketWalletService:钱包资金变动后实时通知余额更新。
更新测试用例,确保重构后功能行为保持一致。
This commit is contained in:
2026-05-26 17:14:19 +08:00
parent 36e50383ba
commit 618201f980
12 changed files with 408 additions and 84 deletions

View File

@@ -2,6 +2,7 @@
namespace App\Services\Ticket;
use App\Models\Draw;
use App\Models\RiskPool;
use App\Lottery\ErrorCode;
use App\Models\TicketItem;
@@ -14,6 +15,7 @@ final class RiskPoolService
{
public function __construct(
private readonly PlayCatalogResolver $catalogResolver,
private readonly RiskPoolRealtimePublisher $riskRealtime,
) {}
/**
@@ -90,6 +92,10 @@ final class RiskPoolService
throw new TicketOperationException('risk_sold_out', ErrorCode::RiskPoolSoldOut->value);
}
$soldOutBefore = (int) $pool->sold_out_status;
$lockedBefore = (int) $pool->locked_amount;
$totalBefore = (int) $pool->total_cap_amount;
$pool->forceFill([
'locked_amount' => (int) $pool->locked_amount + $amount,
'remaining_amount' => (int) $pool->remaining_amount - $amount,
@@ -97,6 +103,15 @@ final class RiskPoolService
'version' => (int) $pool->version + 1,
])->save();
$this->riskRealtime->publishAfterLock(
$drawId,
$lock['number_4d'],
$soldOutBefore,
$lockedBefore,
$totalBefore,
$pool,
);
RiskPoolLockLog::query()->create([
'draw_id' => $drawId,
'normalized_number' => $lock['number_4d'],
@@ -172,6 +187,11 @@ final class RiskPoolService
}
}
public function publishManualSoldOut(Draw $draw, string $normalizedNumber): void
{
$this->riskRealtime->publishManualSoldOut($draw, $normalizedNumber);
}
/** 后台改池或释池后,将 Redis 风控快照与 DB 对齐。 */
public function syncRedisStateFromPool(RiskPool $pool): void
{
@@ -279,6 +299,10 @@ LUA;
throw new TicketOperationException('risk_sold_out', ErrorCode::RiskPoolSoldOut->value);
}
$soldOutBefore = (int) $pool->sold_out_status;
$lockedBefore = (int) $pool->locked_amount;
$totalBefore = (int) $pool->total_cap_amount;
$pool->forceFill([
'locked_amount' => (int) $pool->locked_amount + $amount,
'remaining_amount' => (int) $pool->remaining_amount - $amount,
@@ -286,6 +310,15 @@ LUA;
'version' => (int) $pool->version + 1,
])->save();
$this->riskRealtime->publishAfterLock(
$drawId,
$number4d,
$soldOutBefore,
$lockedBefore,
$totalBefore,
$pool,
);
RiskPoolLockLog::query()->create([
'draw_id' => $drawId,
'normalized_number' => $number4d,