mojiahui/dafuweng-saiadmin6.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构DiceLotteryConfig为DiceLotteryPoolConfig

Browse Source
This commit is contained in:
zhenhui
2026-03-10 17:56:14 +08:00
parent 1a748745cb
commit 54aa0bd34f
22 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/app/dice/model/player/DicePlayer.php
View File

@@ -7,7 +7,7 @@
namespace app\dice\model\player;
use plugin\saiadmin\basic\think\BaseModel;
use app\dice\model\lottery_config\DiceLotteryConfig;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
/**
* 大富翁-玩家模型
@@ -78,14 +78,14 @@ class DicePlayer extends BaseModel
if ($name === null || $name === '') {
$model->setAttr('name', $uid);
}
// 创建玩家时：未指定则自动保存 lottery_config_id 为 DiceLotteryConfig type=0 的 id，没有则为 0
// 创建玩家时：未指定则自动保存 lottery_config_id 为 DiceLotteryPoolConfig type=0 的 id，没有则为 0
try {
$lotteryConfigId = $model->getAttr('lottery_config_id');
} catch (\Throwable $e) {
$lotteryConfigId = null;
}
if ($lotteryConfigId === null || $lotteryConfigId === '' || (int) $lotteryConfigId === 0) {
$config = DiceLotteryConfig::where('type', 0)->find();
$config = DiceLotteryPoolConfig::where('type', 0)->find();
$model->setAttr('lottery_config_id', $config ? (int) $config->id : 0);
}
// 彩金池权重默认取 type=0 的奖池配置
@@ -93,11 +93,11 @@ class DicePlayer extends BaseModel
}
/**
* 从 DiceLotteryConfig type=0 取 t1_weight～t5_weight 作为玩家未设置时的默认值
* 从 DiceLotteryPoolConfig type=0 取 t1_weight～t5_weight 作为玩家未设置时的默认值
*/
protected static function setDefaultWeightsFromLotteryConfig(DicePlayer $model): void
{
$config = DiceLotteryConfig::where('type', 0)->find();
$config = DiceLotteryPoolConfig::where('type', 0)->find();
if (!$config) {
return;
}
@@ -185,8 +185,8 @@ class DicePlayer extends BaseModel
/**
* 关联彩金池配置
*/
public function diceLotteryConfig()
public function diceLotteryPoolConfig()
{
return $this->belongsTo(DiceLotteryConfig::class, 'lottery_config_id', 'id');
return $this->belongsTo(DiceLotteryPoolConfig::class, 'lottery_config_id', 'id');
}
}