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

将项目中所有total_draw_count字段重构为total_ticket_count字段

Browse Source 
将项目中所有paid_draw_count字段重构为paid_ticket_count字段
将项目中所有free_draw_count字段重构为free_ticket_count字段
This commit is contained in:
zhenhui
2026-03-05 14:15:32 +08:00
parent 5ab16243bd
commit e5f83846b3
16 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/app/dice/controller/player_ticket_record/DicePlayerTicketRecordController.php
View File

@@ -41,12 +41,12 @@ class DicePlayerTicketRecordController extends BaseController
['username', ''],
['use_coins_min', ''],
['use_coins_max', ''],
['total_draw_count_min', ''],
['total_draw_count_max', ''],
['paid_draw_count_min', ''],
['paid_draw_count_max', ''],
['free_draw_count_min', ''],
['free_draw_count_max', ''],
['total_ticket_count_min', ''],
['total_ticket_count_max', ''],
['paid_ticket_count_min', ''],
['paid_ticket_count_max', ''],
['free_ticket_count_min', ''],
['free_ticket_count_max', ''],
['create_time_min', ''],
['create_time_max', ''],
]);

16
server/app/dice/logic/player_ticket_record/DicePlayerTicketRecordLogic.php
View File

@@ -25,28 +25,28 @@ class DicePlayerTicketRecordLogic extends BaseLogic
}
/**
* 添加前：总抽奖次数 = 购买抽奖次数 + 赠送抽奖次数
* 添加前：total_ticket_count = paid_ticket_count + free_ticket_count
*/
public function add(array $data): mixed
{
$data = $this->fillTotalDrawCount($data);
$data = $this->fillTotalTicketCount($data);
return parent::add($data);
}
/**
* 修改前：总抽奖次数 = 购买抽奖次数 + 赠送抽奖次数
* 修改前：total_ticket_count = paid_ticket_count + free_ticket_count
*/
public function edit($id, array $data): mixed
{
$data = $this->fillTotalDrawCount($data);
$data = $this->fillTotalTicketCount($data);
return parent::edit($id, $data);
}
private function fillTotalDrawCount(array $data): array
private function fillTotalTicketCount(array $data): array
{
$paid = isset($data['paid_draw_count']) ? (int) $data['paid_draw_count'] : 0;
$free = isset($data['free_draw_count']) ? (int) $data['free_draw_count'] : 0;
$data['total_draw_count'] = $paid + $free;
$paid = isset($data['paid_ticket_count']) ? (int) $data['paid_ticket_count'] : 0;
$free = isset($data['free_ticket_count']) ? (int) $data['free_ticket_count'] : 0;
$data['total_ticket_count'] = $paid + $free;
return $data;
}
}

12
server/app/dice/logic/player_wallet_record/DicePlayerWalletRecordLogic.php
View File

@@ -29,9 +29,9 @@ class DicePlayerWalletRecordLogic extends BaseLogic
*/
public function add(array $data): mixed
{
$data['total_draw_count'] = $data['total_draw_count'] ?? 0;
$data['paid_draw_count'] = $data['paid_draw_count'] ?? 0;
$data['free_draw_count'] = $data['free_draw_count'] ?? 0;
$data['total_ticket_count'] = $data['total_ticket_count'] ?? 0;
$data['paid_ticket_count'] = $data['paid_ticket_count'] ?? 0;
$data['free_ticket_count'] = $data['free_ticket_count'] ?? 0;
return parent::add($data);
}
@@ -81,9 +81,9 @@ class DicePlayerWalletRecordLogic extends BaseLogic
'wallet_after' => $walletAfter,
'remark' => $remark,
'user_id' => $adminId,
'total_draw_count' => 0,
'paid_draw_count' => 0,
'free_draw_count' => 0,
'total_ticket_count' => 0,
'paid_ticket_count' => 0,
'free_ticket_count' => 0,
];
return $this->model->create($record);

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

@@ -28,9 +28,9 @@ use app\dice\model\lottery_config\DiceLotteryConfig;
* @property $t3_wight T3池权重
* @property $t4_wight T4池权重
* @property $t5_wight T5池权重
* @property $total_draw_count 总抽奖次数
* @property $paid_draw_count 购买抽奖次数
* @property $free_draw_count 赠送抽奖次数
* @property $total_ticket_count 总抽奖次数
* @property $paid_ticket_count 购买抽奖次数
* @property $free_ticket_count 赠送抽奖次数
* @property $created_at 创建时间
* @property $updated_at 更新时间
* @property $deleted_at 删除时间

42
server/app/dice/model/player_ticket_record/DicePlayerTicketRecord.php
View File

@@ -18,9 +18,9 @@ use think\model\relation\BelongsTo;
* @property $id ID
* @property $player_id 玩家id
* @property $use_coins 消耗硬币
* @property $total_draw_count 总抽奖次数
* @property $paid_draw_count 购买抽奖次数
* @property $free_draw_count 赠送抽奖次数
* @property $total_ticket_count 总抽奖次数
* @property $paid_ticket_count 购买抽奖次数
* @property $free_ticket_count 赠送抽奖次数
* @property $remark 备注
* @property $create_time 创建时间
* @property $update_time 修改时间
@@ -79,51 +79,51 @@ class DicePlayerTicketRecord extends BaseModel
}
}
/** 总抽奖次数下限 */
public function searchTotalDrawCountMinAttr($query, $value)
/** 总抽奖次数(total_ticket_count)下限 */
public function searchTotalTicketCountMinAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('total_draw_count', '>=', $value);
$query->where('total_ticket_count', '>=', $value);
}
}
/** 总抽奖次数上限 */
public function searchTotalDrawCountMaxAttr($query, $value)
/** 总抽奖次数(total_ticket_count)上限 */
public function searchTotalTicketCountMaxAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('total_draw_count', '<=', $value);
$query->where('total_ticket_count', '<=', $value);
}
}
/** 购买抽奖次数下限 */
public function searchPaidDrawCountMinAttr($query, $value)
/** 购买抽奖次数(paid_ticket_count)下限 */
public function searchPaidTicketCountMinAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('paid_draw_count', '>=', $value);
$query->where('paid_ticket_count', '>=', $value);
}
}
/** 购买抽奖次数上限 */
public function searchPaidDrawCountMaxAttr($query, $value)
/** 购买抽奖次数(paid_ticket_count)上限 */
public function searchPaidTicketCountMaxAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('paid_draw_count', '<=', $value);
$query->where('paid_ticket_count', '<=', $value);
}
}
/** 赠送抽奖次数下限 */
public function searchFreeDrawCountMinAttr($query, $value)
/** 赠送抽奖次数(free_ticket_count)下限 */
public function searchFreeTicketCountMinAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('free_draw_count', '>=', $value);
$query->where('free_ticket_count', '>=', $value);
}
}
/** 赠送抽奖次数上限 */
public function searchFreeDrawCountMaxAttr($query, $value)
/** 赠送抽奖次数(free_ticket_count)上限 */
public function searchFreeTicketCountMaxAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('free_draw_count', '<=', $value);
$query->where('free_ticket_count', '<=', $value);
}
}

6
server/app/dice/model/player_wallet_record/DicePlayerWalletRecord.php
View File

@@ -22,9 +22,9 @@ use think\model\relation\BelongsTo;
* @property $type 类型:0=充值 1=提现 2=购买抽奖次数
* @property $wallet_before 钱包操作前
* @property $wallet_after 钱包操作后
* @property $total_draw_count 总抽奖次数
* @property $paid_draw_count 购买抽奖次数
* @property $free_draw_count 赠送抽奖次数
* @property $total_ticket_count 总抽奖次数
* @property $paid_ticket_count 购买抽奖次数
* @property $free_ticket_count 赠送抽奖次数
* @property $remark 备注
* @property $user_id 操作管理员id（type 3/4 时记录）
* @property $create_time 创建时间

24
server/app/dice/validate/player_ticket_record/DicePlayerTicketRecordValidate.php
View File

@@ -19,9 +19,9 @@ class DicePlayerTicketRecordValidate extends BaseValidate
protected $rule = [
'player_id' => 'require',
'use_coins' => 'require',
'total_draw_count' => 'require',
'paid_draw_count' => 'require',
'free_draw_count' => 'require',
'total_ticket_count' => 'require',
'paid_ticket_count' => 'require',
'free_ticket_count' => 'require',
'remark' => 'require',
];
@@ -31,9 +31,9 @@ class DicePlayerTicketRecordValidate extends BaseValidate
protected $message = [
'player_id' => '玩家id必须填写',
'use_coins' => '消耗硬币必须填写',
'total_draw_count' => '总抽奖次数必须填写',
'paid_draw_count' => '购买抽奖次数必须填写',
'free_draw_count' => '赠送抽奖次数必须填写',
'total_ticket_count' => '总抽奖次数必须填写',
'paid_ticket_count' => '购买抽奖次数必须填写',
'free_ticket_count' => '赠送抽奖次数必须填写',
'remark' => '备注必须填写',
];
@@ -44,17 +44,17 @@ class DicePlayerTicketRecordValidate extends BaseValidate
'save' => [
'player_id',
'use_coins',
'total_draw_count',
'paid_draw_count',
'free_draw_count',
'total_ticket_count',
'paid_ticket_count',
'free_ticket_count',
'remark',
],
'update' => [
'player_id',
'use_coins',
'total_draw_count',
'paid_draw_count',
'free_draw_count',
'total_ticket_count',
'paid_ticket_count',
'free_ticket_count',
'remark',
],
];