交友结束 部分逻辑修改

This commit is contained in:
2026-01-03 10:55:49 +08:00
parent 78c06adaf8
commit 632527da5c
2 changed files with 19 additions and 9 deletions

View File

@@ -113,7 +113,8 @@ 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'];
$room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
// $room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
$room_updatatime = db::name('vs_user_friending')->where(['id' => $id])->value('update_time');
if($room_updatatime){ //180秒内没操作 则创建关系无(元旦 泽喜 说的)
if(time() - $room_updatatime > 180){
$this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
@@ -139,7 +140,7 @@ class Friend extends Model
//结束交友游戏
if($step == 1){
db::name('vs_user_friending')->where(['id' => $id])->update(['status' => 2]);
db::name('vs_user_friending')->where(['id' => $id])->update(['status' => 2,'update_time' => time()]);
}
//推送给前端消息
$text['text'] = $step == 1 ? '交友结束' : '牵手良缘';
@@ -166,11 +167,16 @@ 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 = '';
// 修改当前交友阶段
$res = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
$res2 = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
if ($originalPairs && $res && $res2) {
if ($originalPairs) {
// 修改当前交友阶段
$res = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
if($res){
$res2 = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2,'update_time' => time()]);
}
//所有人下麦
$on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
if($on_pit){
@@ -256,10 +262,14 @@ class Friend extends Model
return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
} else {
$ress = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
$re2s = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
$ress = 0;
if($re2s){
$ress = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2,'update_time' => time()]);
}
//推送给前端消息
$text['status1'] = $ress.'<=>'.$re2s.'<=>'.$res.'<=>'.$res2.'<=>'.$originalPairs;
$text['status1'] = $ress.'<=>'.$re2s.'<=>'.$originalPairs;
$text['text'] = '交友结束';
$text['step'] = 1;//1 等待邂逅 2 心动连线 3 牵手良缘
model('api/Chat')->sendMsg(1049,$room_id,$text);