From b81ebd1f37be6431d0171cd8909f95707b214a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 3 Sep 2025 16:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E5=8D=A1=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E5=B0=8F=E6=88=BF=E9=97=B4=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=BB=A7=E7=BB=AD=E8=BF=9B=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Friend.php | 66 ++++++++++++++++---------------- application/common.php | 1 - 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index 7cd981d..71931c0 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -157,44 +157,46 @@ class Friend extends Model $originalPairs = db::name('vs_user_friending_heart') ->where(['id'=>$friending_heart['id']]) ->update(['status' => 3,'friend_config_id' =>$friending_config_id]); + $msg = ''; if ($originalPairs) { $relation = db::name('vs_relation')->where('id',$friending_config_id)->value('name'); if($friending_heart['heart_value'] >= get_system_config_value('friend_heart_create_room') && $friending_config_id > 0){ //创建小房间 $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){ - //推送给前端消息 - $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]; - } + $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 = [ + 'room_id' => $room_ids['data'], + 'relation_id' => $friending_config_id, + 'user_id' => $user1, + 'user_id1' => $user2, + 'time_day' => time() + get_system_config_value('friend_room_timea') * 60, + 'createtime' => time(), + 'status' => 1, + 'type' => 1 + ]; + db::name('vs_room_cp_movie')->insert($datda); - //记录小房间 - $datda = [ - 'room_id' => $room_ids['data'], - 'relation_id' => $friending_config_id, - 'user_id' => $user1, - 'user_id1' => $user2, - 'time_day' => time() + get_system_config_value('friend_room_timea') * 60, - 'createtime' => time(), - 'status' => 1, - 'type' => 1 - ]; - db::name('vs_room_cp_movie')->insert($datda); - - if($room_ids['data']){ - $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); + if($room_ids['data']){ + $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'] = '交友结束未创建房间'; @@ -227,7 +229,7 @@ class Friend extends Model $text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘 model('api/Chat')->sendMsg(1049,$room_id,$text); db::commit(); - return ['code' => 1, 'msg' => '创建关系成功', 'data' => null]; + return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null]; } else { //推送给前端消息 $text['text'] = '交友结束'; diff --git a/application/common.php b/application/common.php index dcfd81b..6c39f82 100644 --- a/application/common.php +++ b/application/common.php @@ -1104,7 +1104,6 @@ function coin_earning($all_gift_price,$ratio){ //金币转换人民币 //小数点保留4位 $result = $all_gift_price * $ratio / 100 / get_system_config_value('rmb_coin_ratio'); - return round($result, 4); }