卡无关系 返回头像数据
This commit is contained in:
@@ -174,12 +174,6 @@ class Friend extends Model
|
||||
$room_ids = model('api/Room')->user_create_room($user1,'的电影房',get_system_config_value('web_site').'/data/avatar/head_pic.png','交友房产生的一次性房间',7);
|
||||
if($room_ids['code'] != 1){
|
||||
$msg = 'cp电影房创建失败';
|
||||
// //推送给前端消息
|
||||
// $text['text'] = '交友结束';
|
||||
// $text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘
|
||||
// model('api/Chat')->sendMsg(1049,$room_id,$text);
|
||||
// db::rollback();
|
||||
// return ['code' => 0, 'msg' => 'cp电影房创建失败,请联系管理员','data' => null];
|
||||
}else{
|
||||
//记录小房间
|
||||
$datda = [
|
||||
@@ -198,20 +192,18 @@ class Friend extends Model
|
||||
$text['text'] = '交友结束并创建房间';
|
||||
$text['relation_name'] = $relation;
|
||||
$text['room_id'] = $room_ids['data'];//前端用来让用户跳转的房间id
|
||||
$text['user1_id'] = $user1;//进小房间的用户id
|
||||
$text['user2_id'] = $user2;//进小房间的用户id
|
||||
$text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar');
|
||||
$text['user1_nickname'] = db::name('user')->where(['id'=>$user1])->value('nickname');
|
||||
$text['user2_avatar'] = db::name('user')->where(['id'=>$user2])->value('avatar');
|
||||
$text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
|
||||
model('api/Chat')->sendMsg(1051,$room_id,$text);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
$text['text'] = '交友结束未创建房间';
|
||||
$text['relation_name'] = $relation;
|
||||
model('api/Chat')->sendMsg(1051,$room_id,$text);
|
||||
}
|
||||
$text['user1_id'] = $user1;
|
||||
$text['user2_id'] = $user2;
|
||||
$text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar');
|
||||
$text['user1_nickname'] = db::name('user')->where(['id'=>$user1])->value('nickname');
|
||||
$text['user2_avatar'] = db::name('user')->where(['id'=>$user2])->value('avatar');
|
||||
$text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
|
||||
model('api/Chat')->sendMsg(1051,$room_id,$text);
|
||||
|
||||
// 修改当前交友阶段
|
||||
db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
|
||||
|
||||
Reference in New Issue
Block a user