MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

交友卡关系 创建小房间失败继续进行

Browse Source
This commit is contained in:
刘华清
2025-09-03 16:20:35 +08:00
parent ceab1684db
commit b81ebd1f37
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/api/model/Friend.php
View File

@@ -157,20 +157,21 @@ class Friend extends Model
$originalPairs = db::name('vs_user_friending_heart') $originalPairs = db::name('vs_user_friending_heart')
->where(['id'=>$friending_heart['id']]) ->where(['id'=>$friending_heart['id']])
->update(['status' => 3,'friend_config_id' =>$friending_config_id]); ->update(['status' => 3,'friend_config_id' =>$friending_config_id]);
$msg = '';
if ($originalPairs) { if ($originalPairs) {
$relation = db::name('vs_relation')->where('id',$friending_config_id)->value('name'); $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){ 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); $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){ if($room_ids['code'] != 1){
//推送给前端消息 $msg = 'cp电影房创建失败';
$text['text'] = '交友结束'; // //推送给前端消息
$text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘 // $text['text'] = '交友结束';
model('api/Chat')->sendMsg(1049,$room_id,$text); // $text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘
db::rollback(); // model('api/Chat')->sendMsg(1049,$room_id,$text);
return ['code' => 0, 'msg' => 'cp电影房创建失败，请联系管理员','data' => null]; // db::rollback();
} // return ['code' => 0, 'msg' => 'cp电影房创建失败，请联系管理员','data' => null];
}else{
//记录小房间 //记录小房间
$datda = [ $datda = [
'room_id' => $room_ids['data'], 'room_id' => $room_ids['data'],
@@ -196,6 +197,7 @@ class Friend extends Model
$text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname'); $text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
model('api/Chat')->sendMsg(1051,$room_id,$text); model('api/Chat')->sendMsg(1051,$room_id,$text);
} }
}
}else{ }else{
$text['text'] = '交友结束未创建房间'; $text['text'] = '交友结束未创建房间';
$text['relation_name'] = $relation; $text['relation_name'] = $relation;
@@ -227,7 +229,7 @@ class Friend extends Model
$text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘 $text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘
model('api/Chat')->sendMsg(1049,$room_id,$text); model('api/Chat')->sendMsg(1049,$room_id,$text);
db::commit(); db::commit();
return ['code' => 1, 'msg' => '创建关系成功', 'data' => null]; return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
} else { } else {
//推送给前端消息 //推送给前端消息
$text['text'] = '交友结束'; $text['text'] = '交友结束';

1
application/common.php
View File

@@ -1104,7 +1104,6 @@ function coin_earning($all_gift_price,$ratio){
//金币转换人民币 //金币转换人民币
//小数点保留4位 //小数点保留4位
$result = $all_gift_price * $ratio / 100 / get_system_config_value('rmb_coin_ratio'); $result = $all_gift_price * $ratio / 100 / get_system_config_value('rmb_coin_ratio');
return round($result, 4); return round($result, 4);
} }