优化中奖权重计算方式

server/app/dice/controller/play_record/DicePlayRecordController.php

@@ -12,7 +12,7 @@ use app\dice\logic\play_record\DicePlayRecordLogic;
 use app\dice\validate\play_record\DicePlayRecordValidate;
 use app\dice\model\player\DicePlayer;
 use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
-use app\dice\model\reward_config\DiceRewardConfig;
+use app\dice\model\reward\DiceRewardConfig;
 use plugin\saiadmin\service\Permission;
 use support\Request;
 use support\Response;

server/app/dice/controller/reward/DiceRewardController.php

@@ -0,0 +1,120 @@
+<?php
+// +----------------------------------------------------------------------
+// | saiadmin [ saiadmin快速开发框架 ]
+// +----------------------------------------------------------------------
+namespace app\dice\controller\reward;
+
+use app\dice\logic\reward\DiceRewardLogic;
+use app\dice\model\reward\DiceReward;
+use plugin\saiadmin\basic\BaseController;
+use plugin\saiadmin\service\Permission;
+use support\Request;
+use support\Response;
+
+/**
+ * 奖励对照控制器（dice_reward，按方向分页列表 + 权重编辑）
+ */
+class DiceRewardController extends BaseController
+{
+    /**
+     * 分页列表，按 direction 区分顺时针(0)/逆时针(1)
+     * 参数：direction(必), tier(选), page, limit, orderField, orderType
+     */
+    #[Permission('奖励对照列表', 'dice:reward:index:index')]
+    public function index(Request $request): Response
+    {
+        $direction = $request->input('direction', null);
+        if ($direction === null || $direction === '') {
+            return $this->fail('请传入 direction（0=顺时针 1=逆时针）');
+        }
+        $direction = (int) $direction;
+        if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) {
+            return $this->fail('direction 必须为 0（顺时针）或 1（逆时针）');
+        }
+        $tier = $request->input('tier', '');
+        $page = (int) $request->input('page', 1);
+        $limit = (int) $request->input('limit', 10);
+        $orderField = $request->input('orderField', 'r.tier');
+        $orderType = $request->input('orderType', 'asc');
+
+        $logic = new DiceRewardLogic();
+        $data = $logic->getListWithConfig($direction, [
+            'tier'       => $tier,
+            'orderField' => $orderField,
+            'orderType'  => $orderType,
+        ], $page, $limit);
+        return $this->success($data);
+    }
+
+    /**
+     * 权重编辑弹窗：按档位分组获取当前方向的配置+权重（单方向，用于兼容）
+     * 参数：direction 0=顺时针 1=逆时针
+     */
+    #[Permission('奖励对照列表', 'dice:reward:index:index')]
+    public function weightRatioList(Request $request): Response
+    {
+        $direction = (int) $request->input('direction', 0);
+        if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) {
+            $direction = DiceReward::DIRECTION_CLOCKWISE;
+        }
+        $logic = new DiceRewardLogic();
+        $data = $logic->getListGroupedByTierForDirection($direction);
+        return $this->success($data);
+    }
+
+    /**
+     * 权重编辑弹窗：按档位分组获取配置+顺时针/逆时针权重（dice_reward 双方向）
+     * 返回与 reward_config 权重配比一致结构，供奖励对照页弹窗同时编辑 direction=0/1
+     */
+    #[Permission('奖励对照列表', 'dice:reward:index:index')]
+    public function weightRatioListWithDirection(Request $request): Response
+    {
+        $logic = new DiceRewardLogic();
+        $data = $logic->getListGroupedByTierWithDirection();
+        return $this->success($data);
+    }
+
+    /**
+     * 权重编辑弹窗：按方向+点数批量更新权重（写入 dice_reward）
+     * 参数：items: [{ grid_number, weight_clockwise, weight_counterclockwise }, ...]
+     */
+    #[Permission('奖励对照修改', 'dice:reward:index:update')]
+    public function batchUpdateWeights(Request $request): Response
+    {
+        $items = $request->post('items', []);
+        if (!is_array($items)) {
+            return $this->fail('参数 items 必须为数组');
+        }
+        try {
+            $logic = new DiceRewardLogic();
+            $logic->batchUpdateWeights($items);
+            return $this->success('保存成功');
+        } catch (\plugin\saiadmin\exception\ApiException $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 权重编辑弹窗：批量更新当前方向的权重（单方向，用于兼容）
+     * 参数：direction(必), items: [{ id, weight }, ...]
+     */
+    #[Permission('奖励对照修改', 'dice:reward:index:update')]
+    public function batchUpdateWeightsByDirection(Request $request): Response
+    {
+        $direction = (int) $request->post('direction', 0);
+        if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) {
+            return $this->fail('direction 必须为 0（顺时针）或 1（逆时针）');
+        }
+        $items = $request->post('items', []);
+        if (!is_array($items)) {
+            return $this->fail('参数 items 必须为数组');
+        }
+        try {
+            $logic = new DiceRewardLogic();
+            $logic->batchUpdateWeightsByDirection($direction, $items);
+            return $this->success('保存成功');
+        } catch (\plugin\saiadmin\exception\ApiException $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
+}

server/app/dice/controller/reward_config/DiceRewardConfigController.php

@@ -8,6 +8,7 @@ namespace app\dice\controller\reward_config;
 
 use plugin\saiadmin\basic\BaseController;
 use app\dice\logic\reward_config\DiceRewardConfigLogic;
+use app\dice\logic\reward\DiceRewardLogic;
 use app\dice\validate\reward_config\DiceRewardConfigValidate;
 use plugin\saiadmin\service\Permission;
 use support\Request;
@@ -124,20 +125,21 @@ class DiceRewardConfigController extends BaseController
     }
 
     /**
-     * T1-T5、BIGWIN 权重配比：按档位分组返回配置列表
+     * T1-T5、BIGWIN 权重配比：按档位分组返回配置列表（含顺时针/逆时针权重，来自 dice_reward）
      * @param Request $request
      * @return Response
      */
     #[Permission('奖励配置列表', 'dice:reward_config:index:index')]
     public function weightRatioList(Request $request): Response
     {
-        $data = $this->logic->getListGroupedByTier();
+        $rewardLogic = new DiceRewardLogic();
+        $data = $rewardLogic->getListGroupedByTierWithDirection();
         return $this->success($data);
     }
 
     /**
-     * T1-T5、BIGWIN 权重配比：批量更新权重（单条 weight 1-10000，各档位权重和不限制）
-     * 保存后 Logic 会重新实例化奖励配置表缓存（DiceRewardConfig::refreshCache）
+     * T1-T5、BIGWIN 权重配比：按 DiceReward 主键 id 批量更新 weight（写入 dice_reward，修改后刷新缓存）
+     * items: [ { id: DiceReward.id, weight: 1-10000 }, ... ]
      * @param Request $request
      * @return Response
      */
@@ -149,13 +151,32 @@ class DiceRewardConfigController extends BaseController
             return $this->fail('参数 items 必须为数组');
         }
         try {
-            $this->logic->batchUpdateWeights($items);
+            $rewardLogic = new DiceRewardLogic();
+            $rewardLogic->batchUpdateWeights($items);
             return $this->success('保存成功');
         } catch (\plugin\saiadmin\exception\ApiException $e) {
             return $this->fail($e->getMessage());
         }
     }
 
+    /**
+     * 创建奖励对照：按当前 dice_reward_config 为两种方向（顺时针0、逆时针1）生成所有色子可能对应的 dice_reward 记录
+     * 权重默认 1，可在「奖励对照」页的权重编辑弹窗中调整
+     * @param Request $request
+     * @return Response
+     */
+    #[Permission('奖励配置修改', 'dice:reward_config:index:update')]
+    public function createRewardReference(Request $request): Response
+    {
+        try {
+            $rewardLogic = new DiceRewardLogic();
+            $result = $rewardLogic->createRewardReferenceFromConfig();
+            return $this->success($result, '创建奖励对照成功');
+        } catch (\plugin\saiadmin\exception\ApiException $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
+
     /**
      * 权重配比测试：仅模拟落点统计，不创建游玩记录。按当前配置在内存中模拟 N 次抽奖，返回各 grid_number 落点次数，可选保存到 dice_reward_config_record。
      * @param Request $request test_count: 100|500|1000, save_record: bool, lottery_config_id: int|null 奖池配置ID，用于设定 T1-T5 概率