From 5d509465c5a631915ab02104830a53b708573413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 19 Aug 2025 10:20:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 3bf4778..9d6dbba 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -40,6 +40,7 @@ class Friend extends Model
            //推送给前端消息
             $text['text'] = '交友开始';
             $text['step'] = 2;
+            $text['friend_id'] = $id;
             model('api/Chat')->sendMsg(1039,$room_id,$text);
             return ['code' => 1, 'msg' => '操作成功！', 'data' => ['friend_id' => $id]];
         }else{

From 42ae0009e8289a87b3747b71bc7bb5bca4ac2354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 19 Aug 2025 10:21:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=BA=A4=E5=8F=8B?=
 =?UTF-8?q?=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 51f5c67..ac86387 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1679,6 +1679,7 @@ class Room extends Model
         }
         //开启事务
         db::startTrans();
+        $data = [];
         if($type == 1 || $type == 3 || $type == 4){
             $data = [
                 'label_id' => 1,

From a01117a342608e821688e8495573d8df58b10ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 19 Aug 2025 15:34:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/UserZone.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index 2372db6..3d85fe6 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -548,6 +548,12 @@ class UserZone extends Model
         $data['is_delete'] = 2;
         $data['delete_time'] = time();
         $reslut = db::name('user_zone')->where('id', $zid)->update($data);
+        $top_zone = db::name('user_zone_topic')->where('zone_id',$zid)->select();
+        if($top_zone){
+            foreach ($top_zone as $v){
+                db::name('user_zone_topic')->where('id',$v['id'])->delete();
+            }
+        }
         if ($reslut) {
             return ['code' => 1, 'msg' => '删除成功', 'data' => null];
         } else {

From 694983f09d09bb7660e796aa2959f901360ba6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 19 Aug 2025 15:37:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index ac86387..de66e1e 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1491,7 +1491,7 @@ class Room extends Model
         $user_info['is_room_owner'] = db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->find() ? 1 : 0;
         $user_info['is_follow'] = db::name('user_follow')->where(['user_id' => $uid, 'follow_id' => $user_id,'type' => 1])->find() ? 1 : 0;
         //近90天内收到的礼物数量
-        $user_info['gift_num'] = db::name('vs_give_gift')->where(['gift_user' => $uid])->whereTime('createtime', '>', strtotime('-90 day'))->sum('number')?? 0;
+        $user_info['gift_num'] = db::name('vs_give_gift')->where(['gift_user' => $user_id])->whereTime('createtime', '>', strtotime('-90 day'))->sum('number')?? 0;
         if($guild_id){
             $guild = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name');
         }else{