feat(odds): 支持基于开注商的赔率区分与优先级处理

- 在赔率数据表中新增 provider_code 字段，默认值为 GLOBAL - 赔率接口与服务中新增 provider_code 参数支持，实现开注商特定赔率加载 - 解析赔率集合时，根据 provider_code 优先级进行排序与筛选，保证特定开注商赔率优先 - 优化赔率唯一索引，新增 provider_code 列以防止不同开注商赔率重复冲突 - 调整赔率相关验证规则，支持开注商代码的合法性与可选性检查 - 玩法解析与出票相关逻辑改造，支持多开注商环境下的投注处理 - 管理界面赔率替换接口增加 provider_code 字段支持 - 同步和测试用例覆盖 provider_code 相关功能，验证开注商赔率隔离与优先切换 - PlayEffectiveCatalogController 支持按 provider_code 返回赔率目录数据 - TicketPlacementService 与 TicketPreviewService 修改为支持 provider_code 多开注商玩法解析 - 维护 OddsStandardScopes 同步逻辑，保证开注商维度佣金与赔率正确同步 - AdminConfigPresenter 增加了对应数据的 provider_code 与 dimension 输出字段 - SDK接口添加 odds_snapshot_json 中开注商字段，完善赔率快照信息 - 路由配置调整管理文档地址，无关改动细微修改
2026-07-09 10:52:05 +08:00
parent 2d50980999
commit c6c10f1397
16 changed files with 351 additions and 36 deletions
--- a/app/Services/Config/EffectivePlayCatalogService.php
+++ b/app/Services/Config/EffectivePlayCatalogService.php
@@ -20,9 +20,10 @@ final class EffectivePlayCatalogService
    /**
     * @return array<string, mixed>
     */
-    public function build(?string $currencyCode = null): array
+    public function build(?string $currencyCode = null, ?string $providerCode = null): array
    {
        $currency = $this->resolveBettableCurrency($currencyCode);
+        $providerCode = strtoupper((string) ($providerCode ?: 'GLOBAL'));

        $playVersion = PlayConfigVersion::query()
            ->where('status', ConfigVersionStatus::Active->value)
@@ -45,6 +46,7 @@ final class EffectivePlayCatalogService
        $oddsRows = OddsItem::query()
            ->where('version_id', $oddsVersion->id)
            ->where('currency_code', $currency->code)
+            ->whereIn('provider_code', ['GLOBAL', $providerCode])
            ->get();

        /** @var Collection<string, Collection<int, OddsItem>> */
@@ -60,8 +62,11 @@ final class EffectivePlayCatalogService
                ['display_order', 'asc'],
                ['play_code', 'asc'],
            ])
-            ->map(function (PlayConfigItem $c) use ($oddsByPlay): array {
-                $items = $oddsByPlay->get($c->play_code, collect());
+            ->map(function (PlayConfigItem $c) use ($oddsByPlay, $providerCode): array {
+                $items = $this->resolveProviderOddsItems(
+                    $oddsByPlay->get($c->play_code, collect()),
+                    $providerCode,
+                );
                $o = $this->pickPrimaryOddsItem($items);

                return [
@@ -80,6 +85,7 @@ final class EffectivePlayCatalogService

        return [
            'currency_code' => $currency->code,
+            'provider_code' => $providerCode,
            'effective_versions' => [
                'play_config' => $this->serializeVersionHead($playVersion),
                'odds' => $this->serializeVersionHead($oddsVersion),
@@ -90,6 +96,30 @@ final class EffectivePlayCatalogService
        ];
    }

+    /**
+     * @param  Collection<int, OddsItem>  $items
+     * @return Collection<int, OddsItem>
+     */
+    private function resolveProviderOddsItems(Collection $items, string $providerCode): Collection
+    {
+        $selected = [];
+
+        foreach ($items->sortBy(fn (OddsItem $row): int => (string) $row->provider_code === $providerCode ? 0 : 1) as $row) {
+            $dimension = $row->dimension === null ? 'null' : (string) $row->dimension;
+            $key = implode('|', [
+                (string) $row->prize_scope,
+                strtoupper((string) $row->currency_code),
+                $dimension,
+            ]);
+
+            if (! isset($selected[$key])) {
+                $selected[$key] = $row;
+            }
+        }
+
+        return collect(array_values($selected));
+    }
+
    /**
     * 大厅列表展示单档赔率：优先头奖档 {@see first}，兼容历史 {@see default}。
     *
@@ -164,6 +194,7 @@ final class EffectivePlayCatalogService
    private function serializeOddsItem(OddsItem $r): array
    {
        return [
+            'provider_code' => $r->provider_code ?? 'GLOBAL',
            'prize_scope' => $r->prize_scope,
            'odds_value' => (int) $r->odds_value,
            'rebate_rate' => (string) $r->rebate_rate,
--- a/app/Services/Config/OddsStreamService.php
+++ b/app/Services/Config/OddsStreamService.php
@@ -6,6 +6,7 @@ use App\Models\Currency;
 use App\Models\OddsItem;
 use App\Models\PlayType;
 use App\Models\AdminUser;
+use App\Models\BetProvider;
 use App\Models\OddsVersion;
 use Illuminate\Http\Request;
 use App\Services\AuditLogger;
@@ -61,6 +62,7 @@ final class OddsStreamService
                foreach ($source->items()->orderBy('currency_code')->orderBy('play_code')->get() as $row) {
                    OddsItem::query()->create([
                        'version_id' => $draft->id,
+                        'provider_code' => $row->provider_code ?? 'GLOBAL',
                        'play_code' => $row->play_code,
                        'prize_scope' => $row->prize_scope,
                        'dimension' => $row->dimension,
@@ -77,6 +79,7 @@ final class OddsStreamService
                    foreach (OddsStandardScopes::PRESET_ODDS_BY_SCOPE as $scope => $oddsValue) {
                        OddsItem::query()->create([
                            'version_id' => $draft->id,
+                            'provider_code' => 'GLOBAL',
                            'play_code' => $pt->play_code,
                            'prize_scope' => $scope,
                            'dimension' => $pt->dimension,
@@ -108,6 +111,7 @@ final class OddsStreamService
            foreach ($items as $row) {
                OddsItem::query()->create([
                    'version_id' => $draft->id,
+                    'provider_code' => strtoupper((string) ($row['provider_code'] ?? 'GLOBAL')),
                    'play_code' => (string) $row['play_code'],
                    'prize_scope' => (string) $row['prize_scope'],
                    'dimension' => isset($row['dimension']) ? (int) $row['dimension'] : null,
@@ -222,6 +226,14 @@ final class OddsStreamService
            true,
        );
        $allowedScopes = array_fill_keys(OddsStandardScopes::SCOPE_KEYS, true);
+        $allowedProviderCodes = array_fill_keys(
+            BetProvider::query()
+                ->pluck('code')
+                ->map(fn (string $code) => strtoupper($code))
+                ->all(),
+            true,
+        );
+        $allowedProviderCodes['GLOBAL'] = true;

        $errors = [];
        $seenKeys = [];
@@ -232,13 +244,18 @@ final class OddsStreamService

        foreach ($items as $index => $row) {
            $playCode = (string) $row->play_code;
+            $providerCode = strtoupper((string) ($row->provider_code ?? 'GLOBAL'));
            $scope = (string) $row->prize_scope;
            $dimension = $row->dimension;
            $currencyCode = strtoupper((string) $row->currency_code);
            $oddsValue = (int) $row->odds_value;
            $rebateRate = (float) $row->rebate_rate;
            $commissionRate = (float) $row->commission_rate;
-            $key = $playCode.'|'.$scope.'|'.$currencyCode;
+            $key = $providerCode.'|'.$playCode.'|'.$scope.'|'.$currencyCode.'|'.($dimension === null ? 'null' : (string) $dimension);
+
+            if (! isset($allowedProviderCodes[$providerCode])) {
+                $errors["items.$index.provider_code"][] = '开注商不存在';
+            }

            if (! isset($allowedPlayCodes[$playCode])) {
                $errors["items.$index.play_code"][] = '玩法不存在';
@@ -257,7 +274,7 @@ final class OddsStreamService
            }

            if (isset($seenKeys[$key])) {
-                $errors["items.$index"][] = '同一玩法、档位、币种存在重复赔率项';
+                $errors["items.$index"][] = '同一开注商、玩法、档位、币种、维度存在重复赔率项';
            }
            $seenKeys[$key] = true;

--- a/app/Services/Ticket/PlayCatalogResolver.php
+++ b/app/Services/Ticket/PlayCatalogResolver.php
@@ -88,7 +88,7 @@ final class PlayCatalogResolver
    /**
     * @return array{play_config: PlayConfigItem, odds_items: Collection<int, OddsItem>}
     */
-    public function resolve(string $playCode, string $currencyCode): array
+    public function resolve(string $playCode, string $currencyCode, ?string $providerCode = null): array
    {
        $playVersion = PlayConfigVersion::query()
            ->where('status', ConfigVersionStatus::Active->value)
@@ -107,12 +107,16 @@ final class PlayCatalogResolver
            ->where('status', ConfigVersionStatus::Active->value)
            ->firstOrFail();

-        $oddsItems = OddsItem::query()
+        $providerCode = strtoupper((string) ($providerCode ?: 'GLOBAL'));
+        $rawOddsItems = OddsItem::query()
            ->where('version_id', $oddsVersion->id)
            ->where('play_code', $playCode)
            ->where('currency_code', strtoupper($currencyCode))
+            ->whereIn('provider_code', ['GLOBAL', $providerCode])
            ->get();

+        $oddsItems = $this->resolveProviderOddsItems($rawOddsItems, $providerCode);
+
        if ($oddsItems->isEmpty()) {
            throw new TicketOperationException('odds_missing', ErrorCode::BetPlayUnsupported->value);
        }
@@ -123,6 +127,30 @@ final class PlayCatalogResolver
        ];
    }

+    /**
+     * @param  Collection<int, OddsItem>  $items
+     * @return Collection<int, OddsItem>
+     */
+    private function resolveProviderOddsItems(Collection $items, string $providerCode): Collection
+    {
+        $selected = [];
+
+        foreach ($items->sortBy(fn (OddsItem $row): int => (string) $row->provider_code === $providerCode ? 0 : 1) as $row) {
+            $dimension = $row->dimension === null ? 'null' : (string) $row->dimension;
+            $key = implode('|', [
+                (string) $row->prize_scope,
+                strtoupper((string) $row->currency_code),
+                $dimension,
+            ]);
+
+            if (! isset($selected[$key])) {
+                $selected[$key] = $row;
+            }
+        }
+
+        return collect(array_values($selected));
+    }
+
    public function resolveCapAmount(int $drawId, string $number4d): int
    {
        $riskVersion = RiskCapVersion::query()
--- a/app/Services/Ticket/PlayRuleEngine.php
+++ b/app/Services/Ticket/PlayRuleEngine.php
@@ -73,6 +73,7 @@ final class PlayRuleEngine
            'combination_count' => $combinationCount,
            'estimated_max_payout' => $estimatedMaxPayout,
            'odds_snapshot_json' => $oddsItems->map(fn (OddsItem $row) => [
+                'provider_code' => (string) ($row->provider_code ?? 'GLOBAL'),
                'prize_scope' => $row->prize_scope,
                'odds_value' => (int) $row->odds_value,
                'rebate_rate' => (string) $row->rebate_rate,
--- a/app/Services/Ticket/TicketPlacementService.php
+++ b/app/Services/Ticket/TicketPlacementService.php
@@ -131,21 +131,22 @@ final class TicketPlacementService
            $closedPlayCleanupRows = [];

            foreach ((array) $payload['lines'] as $index => $line) {
-                try {
-                    $resolved = $this->catalogResolver->resolve((string) $line['play_code'], $currencyCode);
-                } catch (TicketOperationException $e) {
-                    if ($e->lotteryCode === ErrorCode::PlayModeClosed->value) {
-                        $closedPlayCleanupRows[] = [
-                            'client_line_no' => $index + 1,
-                            'play_code' => (string) ($line['play_code'] ?? ''),
-                        ];
+                foreach ($providers as $provider) {
+                    try {
+                        $resolved = $this->catalogResolver->resolve((string) $line['play_code'], $currencyCode, (string) $provider['code']);
+                    } catch (TicketOperationException $e) {
+                        if ($e->lotteryCode === ErrorCode::PlayModeClosed->value) {
+                            $closedPlayCleanupRows[] = [
+                                'client_line_no' => $index + 1,
+                                'play_code' => (string) ($line['play_code'] ?? ''),
+                            ];

-                        continue;
+                            continue 2;
+                        }
+
+                        throw $e;
                    }

-                    throw $e;
-                }
-                foreach ($providers as $provider) {
                    $evaluated = $this->ruleEngine->evaluateLine(
                        (array) $line,
                        $resolved['play_config'],
--- a/app/Services/Ticket/TicketPreviewService.php
+++ b/app/Services/Ticket/TicketPreviewService.php
@@ -52,21 +52,22 @@ final class TicketPreviewService
        $closedPlayCleanupRows = [];

        foreach ((array) $payload['lines'] as $index => $line) {
-            try {
-                $resolved = $this->catalogResolver->resolve((string) $line['play_code'], $currencyCode);
-            } catch (TicketOperationException $e) {
-                if ($e->lotteryCode === ErrorCode::PlayModeClosed->value) {
-                    $closedPlayCleanupRows[] = [
-                        'client_line_no' => $index + 1,
-                        'play_code' => (string) ($line['play_code'] ?? ''),
-                    ];
+            foreach ($providers as $provider) {
+                try {
+                    $resolved = $this->catalogResolver->resolve((string) $line['play_code'], $currencyCode, (string) $provider['code']);
+                } catch (TicketOperationException $e) {
+                    if ($e->lotteryCode === ErrorCode::PlayModeClosed->value) {
+                        $closedPlayCleanupRows[] = [
+                            'client_line_no' => $index + 1,
+                            'play_code' => (string) ($line['play_code'] ?? ''),
+                        ];

-                    continue;
+                        continue 2;
+                    }
+
+                    throw $e;
                }

-                throw $e;
-            }
-            foreach ($providers as $provider) {
                $evaluated = $this->ruleEngine->evaluateLine(
                    (array) $line,
                    $resolved['play_config'],