diff --git a/application/api/model/BlindBoxTurntableGiftDrawWorld.php b/application/api/model/BlindBoxTurntableGiftDrawWorld.php index 7be7781..190bf80 100644 --- a/application/api/model/BlindBoxTurntableGiftDrawWorld.php +++ b/application/api/model/BlindBoxTurntableGiftDrawWorld.php @@ -780,13 +780,13 @@ class BlindBoxTurntableGiftDrawWorld extends Model // 处理飘屏 if ($xlhIsPiaoPing == 1 || $xlhIsPiaoPing == 2) { - $this->handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing,$room); + $this->handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing); } // 更新巡乐会状态并推送 $this->updateAndPushXlhStatus($room_id, $xlh_ext, $currentXlhPeriodsNum); } - private function handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing,$room){ + private function handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing){ if($xlhIsPiaoPing == 1){ // 即将开始推送飘屏 $text = "巡乐会即将开始..."; @@ -837,7 +837,7 @@ class BlindBoxTurntableGiftDrawWorld extends Model if($xlh['current_num'] >= $xlh_ext['open_condition']['start_num']){ $xlh['status'] = 1;//状态 1:巡乐会开始 2:即将开始开始 0:等待开始 //查询巡乐会信息 - $pan_xlh = db::name('vs_room_pan_xlh')->where('room_id',$room_id)->order('id desc')->find(); + $pan_xlh = db::name('vs_room_pan_xlh')->where('send_time',0)->order('id desc')->find(); $xlh['end_time'] = $pan_xlh['end_time'] ?? 0; } elseif($xlh['current_num'] >= $xlh_ext['open_condition']['waiting_start_num'] && $xlh['current_num'] < $xlh_ext['open_condition']['start_num']){ $xlh['status'] = 2;//状态 1:巡乐会开始 2:即将开始开始 0:等待开始