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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-09-10 17:21:19 +08:00
parent 850da31fd2 db1170ef28
commit 0628063bd2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,8 +152,7 @@ class Friend extends Model
$user2 = max($user1_id, $user2_id); $user2 = max($user1_id, $user2_id);
$friending_heart = db::name('vs_user_friending_heart') $friending_heart = db::name('vs_user_friending_heart')
->where(['room_id'=>$room_id,'friend_id'=>$friend_id ,'user1_id' =>$user1,'user2_id' => $user2])->order('id desc')->find(); ->where(['room_id'=>$room_id,'friend_id'=>$friend_id ,'user1_id' =>$user1,'user2_id' => $user2])->order('id desc')->find();
//开启事务
db::startTrans();
$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]);
@@ -206,7 +205,7 @@ class Friend extends Model
// 修改当前交友阶段 // 修改当前交友阶段
db::name('vs_room')->where(['id' => $room_id])->setField('step', 1); db::name('vs_room')->where(['id' => $room_id])->setField('step', 1);
db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
//所有人下麦 //所有人下麦
$on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select(); $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
if($on_pit){ if($on_pit){
@@ -228,14 +227,14 @@ class Friend extends Model
$text['text'] = '交友结束'; $text['text'] = '交友结束';
$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();
return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null]; return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
} else { } else {
//推送给前端消息 //推送给前端消息
$text['text'] = '交友结束'; $text['text'] = '交友结束';
$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::rollback(); db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
return ['code' => 0, 'msg' => '创建关系失败！', 'data' => null]; return ['code' => 0, 'msg' => '创建关系失败！', 'data' => null];
} }
} }