diff --git a/application/api/model/BlindBoxTurntableGiftDrawWorld.php b/application/api/model/BlindBoxTurntableGiftDrawWorld.php index 12029b0..d555e57 100644 --- a/application/api/model/BlindBoxTurntableGiftDrawWorld.php +++ b/application/api/model/BlindBoxTurntableGiftDrawWorld.php @@ -782,9 +782,10 @@ class BlindBoxTurntableGiftDrawWorld extends Model if ($xlhIsPiaoPing == 1 || $xlhIsPiaoPing == 2) { $this->handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing); } - - // 更新巡乐会状态并推送 - $this->updateAndPushXlhStatus($room_id, $xlh_ext, $currentXlhPeriodsNum); + if($xlhPeriodsNum <= $xlh_ext['open_condition']['start_num']){ + // 更新巡乐会状态并推送 + $this->updateAndPushXlhStatus($room_id, $xlh_ext, $currentXlhPeriodsNum); + } } private function handleXlhPiaoPing($room_id, $xlh_ext, $xlhIsPiaoPing){ if($xlhIsPiaoPing == 1){ @@ -838,6 +839,10 @@ class BlindBoxTurntableGiftDrawWorld extends Model $xlh['status'] = 1;//状态 1:巡乐会开始 2:即将开始开始 0:等待开始 //查询巡乐会信息 $pan_xlh = db::name('vs_room_pan_xlh')->where('send_time',0)->order('id desc')->find(); + if(empty($pan_xlh)){ + $this->handleXlhPiaoPing($room_id, $xlh_ext, 2); + $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:等待开始