pk任务

application/api/model/Room.php

@@ -1227,7 +1227,9 @@ class Room extends Model
             'is_pk' => $room['is_pk'],//1-默认接受PK，2不接受',
             'last_pk_room_id' => $last_pk_room_id,
             'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
-            'sexy_coin' => $liao_ta_coin
+            'sexy_coin' => $liao_ta_coin,
+            'start_time' => $room['start_time'],
+            'end_time' => $room['end_time'],
         ];
 
         //当前用户信息

application/api/model/RoomPk.php

@@ -279,11 +279,11 @@ class RoomPk extends Model
     public function search_pk_room($user_id,$room_id,$page,$limit)
     {
         //自己当前房间
-        $room_id_a = db::name('vs_room')->where('user_id', $user_id)->value('id');
+//        $room_id_a = db::name('vs_room')->where('user_id', $user_id)->value('id');
         $room_id_b = db::name('vs_room_pit')->where(['pit_number' => 9, 'user_id' => $user_id])->value('room_id') ?? 0;
-        $room_id_c = [$room_id_a,$room_id_b];
+//        $room_id_c = [$room_id_a,$room_id_b];
         $where = [
-            'a.id' => ['not in',$room_id_c],
+            'a.id' => ['<>',$room_id_b],
             'a.room_status' => 1,
             'a.apply_status' => 2,
             'a.is_pk' => 1,