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

application/common/model/Redpacket.php

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