diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index 1b913b6..caa7866 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -110,8 +110,12 @@ class Friend extends Model $return['user2_nickname'] = db::name('user')->where(['id'=>$originalPairs['user2_id']])->value('nickname'); $return['heart_value'] = $originalPairs['heart_value']; $return['heart_id'] = $originalPairs['id']; + // 修改当前交友阶段 + db::name('vs_room')->where(['id' => $room_id])->setField('step', $step); }else{ $step = 1;//结束下一轮 + // 修改当前交友阶段 分开写 放到前面是为了下麦 + db::name('vs_room')->where(['id' => $room_id])->setField('step', $step); //所有人下麦 $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select(); if($on_pit){ @@ -132,8 +136,6 @@ class Friend extends Model $text['friend_user'] = $return; $text['friend_id'] = $id; model('api/Chat')->sendMsg(1049,$room_id,$text); - // 修改当前交友阶段 - db::name('vs_room')->where(['id' => $room_id])->setField('step', $step); return ['code' => 1, 'msg' => '操作成功!', 'data' => $return]; }