diff --git a/application/api/model/RoomAuction.php b/application/api/model/RoomAuction.php index 3798b01..37b8d03 100644 --- a/application/api/model/RoomAuction.php +++ b/application/api/model/RoomAuction.php @@ -440,10 +440,10 @@ class RoomAuction extends Model public function room_auction_create_or_add($user_id,$user_id1,$relation_id,$time_day,$cp_room_id){ //查询两人是否已创建该关系 $room = db::name('vs_room_auction_relation') - ->where(['user_id1' => $user_id,'user_id2' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()]])->order('id desc')->find(); + ->where(['user_id1' => $user_id,'user_id2' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()],'delete_time' => 0])->order('id desc')->find(); if(!$room){ $room = db::name('vs_room_auction_relation') - ->where(['user_id2' => $user_id,'user_id1' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()]])->order('id desc')->find(); + ->where(['user_id2' => $user_id,'user_id1' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()],'delete_time' => 0])->order('id desc')->find(); } if($room){