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

application/api/model/Friend.php

@@ -152,8 +152,7 @@ class Friend extends Model
         $user2 = max($user1_id, $user2_id);
         $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();
-        //开启事务
-        db::startTrans();
+
         $originalPairs = db::name('vs_user_friending_heart')
             ->where(['id'=>$friending_heart['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_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();
             if($on_pit){
@@ -228,14 +227,14 @@ class Friend extends Model
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text);
-            db::commit();
+
             return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
         } else {
             //推送给前端消息
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             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];
         }
     }