From cdc2498f6bcd4a67ba29a6a9223b3be728408bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 30 Aug 2025 09:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=88=BF=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=20=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89=E9=AD=85=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Friend.php | 3 ---
 application/api/model/Friend.php      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/api/controller/Friend.php b/application/api/controller/Friend.php
index 633a234..b60314e 100644
--- a/application/api/controller/Friend.php
+++ b/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']);
     }
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 75a7c77..368a9f2 100644
--- a/application/api/model/Friend.php
+++ b/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];
     }