交友房结束 清除所有魅力

application/api/controller/Friend.php

@@ -33,9 +33,6 @@ class Friend extends BaseCom
         $room_id = input('room_id', '');
 
         $result = model('Friend')->end_friend($this->uid,$room_id,$friend_id);
-        if($result['code'] == 1){
-            model('Room')->clear_user_charm($this->uid, $room_id);
-        }
 
         return V($result['code'], $result['msg'], $result['data']);
     }

application/api/model/Friend.php

@@ -137,7 +137,7 @@ class Friend extends Model
         $text['friend_user'] = $return;
         $text['friend_id'] = $id;
         model('api/Chat')->sendMsg(1049,$room_id,$text);
-
+        model('Room')->clear_user_charm(db::name('vs_room')->where(['id' => $room_id])->value('user_id'), $room_id);
        return ['code' => 1, 'msg' => '操作成功！', 'data' => $return];
     }