From f8969097d7ab3f511cd5c68170e898c9726b8ddf Mon Sep 17 00:00:00 2001
From: zhenhui <1276357500@qq.com>
Date: Thu, 4 Jun 2026 14:55:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=89=B2=E5=AD=90=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1=E6=9D=83=E9=87=8D=E8=A1=A8=E5=A4=87=E6=B3=A8=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=E4=B8=8A=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/dice/logic/reward/DiceRewardLogic.php | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/server/app/dice/logic/reward/DiceRewardLogic.php b/server/app/dice/logic/reward/DiceRewardLogic.php
index cb99698..54aec47 100644
--- a/server/app/dice/logic/reward/DiceRewardLogic.php
+++ b/server/app/dice/logic/reward/DiceRewardLogic.php
@@ -465,7 +465,7 @@ class DiceRewardLogic
      * - 奖励档位：tier = DiceRewardConfig::where('id', $end_index)->first()->tier
      * - 显示ui：ui_text = DiceRewardConfig::where('id', $end_index)->first()->ui_text
      * - 实际中奖：real_ev = DiceRewardConfig::where('id', $end_index)->first()->real_ev
-     * - 备注：remark = DiceRewardConfig::where('id', $end_index)->first()->remark
+     * - 备注：remark = 按本条对照档位（推断后 T1-T5）的默认备注（T1 大奖、T2 小赚…），非落点格盘面 remark 字段
      * - 类型：type = DiceRewardConfig::where('id', $end_index)->first()->type（-2=唯一惩罚,-1=抽水,0=回本,1=再来一次,2=小赚,3=大奖格）
      * - weight 默认 1，后续在权重编辑弹窗设置
      *
@@ -631,7 +631,8 @@ class DiceRewardLogic
     }
 
     /**
-     * 对照表落点行：档位按结算金额推断，备注与奖励配置页规则一致
+     * 对照表落点行：档位按落点格 real_ev 推断；备注随**本条对照档位**（T1 大奖 / T2 小赚 …），
+     * 与奖励配置页「按结算金额匹配档位备注」一致，不拷贝落点格盘面备注（盘面可保留「大奖格」等细分文案）。
      *
      * @param array<string, mixed> $landingConfig
      * @return array<string, mixed>
@@ -659,24 +660,11 @@ class DiceRewardLogic
             'end_index'   => isset($landingConfig['id']) ? (int) $landingConfig['id'] : 0,
             'ui_text'     => $landingConfig['ui_text'] ?? '',
             'real_ev'     => $landingConfig['real_ev'] ?? null,
-            'remark'      => $this->resolveRemarkForReferenceRow($tier, $landingConfig),
+            'remark'      => $this->defaultRemarkForTier($tier),
             'type'        => isset($landingConfig['type']) ? (int) $landingConfig['type'] : 0,
         ];
     }
 
-    /**
-     * 对照表备注：优先落点格 dice_reward_config.remark，空时再按档位默认（与 createRewardReference 文档一致）
-     */
-    private function resolveRemarkForReferenceRow(string $tier, array $landingConfig): string
-    {
-        $fromLanding = trim((string) ($landingConfig['remark'] ?? ''));
-        if ($fromLanding !== '') {
-            return $fromLanding;
-        }
-
-        return $this->defaultRemarkForTier($tier);
-    }
-
     /**
      * 按结算金额推断档位（与前端 generateIndexByRules 一致）
      */