MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-10-13 17:06:29 +08:00
parent e0265dd287 98771969fc
commit a17bcb1daf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/common/model/Redpacket.php
View File

@@ -80,7 +80,8 @@ class Redpacket extends Model
} }
// 计算开始时间 // 计算开始时间
$startTime = $data['countdown'] > 0 ? (time() + $data['countdown']) : time(); $startTime = $data['countdown'] > 0 ? (time() + $data['countdown']) : time();
$endTime = $startTime + 1200; // 2分钟后结束 //获取配置项 红包没有抢完所展示时间
$endTime = $startTime + get_system_config_value('red_packet_time') ?? 120; // 默认2分钟后结束
// 创建红包 // 创建红包
$redpacketData = [ $redpacketData = [
@@ -125,7 +126,8 @@ class Redpacket extends Model
$data['nickname'] = Db::name('user')->where('id', $data['user_id'])->value('nickname'); $data['nickname'] = Db::name('user')->where('id', $data['user_id'])->value('nickname');
$data['avatar'] = Db::name('user')->where('id', $data['user_id'])->value('avatar'); $data['avatar'] = Db::name('user')->where('id', $data['user_id'])->value('avatar');
$data['redpacket_id'] = $redpacketId; $data['redpacket_id'] = $redpacketId;
$data['start_time'] = $startTime; $data['start_time'] = $startTime;//红包开抢时间
$data['redpacket_time'] = get_system_config_value('red_packet_time');//展示时间
$text = [ $text = [
'redpacketInfo' => $data, 'redpacketInfo' => $data,
'text' => '' 'text' => ''