diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index 312d66ed..16c302d5 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -231,12 +231,24 @@ class Friend extends Model $text1['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘 model('api/Chat')->sendMsg(1049,$room_id,$text1); //查询是否第一次创建关系 - $friend_count1 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user1,'status'=>3])->whereOr(['user2_id'=>$user1,'status'=>3])->count(); + $friend_count1 = db::name('vs_user_friending_heart') + ->where('status', 3) + ->where(function($query) use ($user1) { + $query->where('user1_id', $user1) + ->whereOr('user2_id', $user1); + }) + ->count(); if($friend_count1 == 1){ //任务:10-第一次星球房卡关系(互娱房) model('Tasks')->tasks_complete($user1,10); } - $friend_count2 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user2,'status'=>3])->whereOr(['user2_id'=>$user2,'status'=>3])->count(); + $friend_count2 = db::name('vs_user_friending_heart') + ->where('status', 3) + ->where(function($query) use ($user2) { + $query->where('user1_id', $user2) + ->whereOr('user2_id', $user2); + }) + ->count(); if($friend_count2 == 1){ //任务:10-第一次星球房卡关系(互娱房) model('Tasks')->tasks_complete($user2,10);