From d481ad72cc9adcf6baa98a757abab6ecb743a94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 5 Sep 2025 19:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=20?=
 =?UTF-8?q?=E8=BF=9E=E7=BA=BF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php  |  1 +
 application/api/model/Room.php    | 39 ++++++++++++++++---------------
 application/api/model/RoomPit.php | 10 ++++++++
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 71931c0..eeaccd0 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -399,6 +399,7 @@ class Friend extends Model
         $text['text'] = '心动值变化通知';
         $text['list'] = $heart;
         model('api/Chat')->sendMsg(1054,$room_id,$text);
+        return $heart;
     }
 
     // 获取心跳值排行
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 7a56b92..da5aacb 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -2554,26 +2554,27 @@ class Room extends Model
         if($friend_info){
             $friend['friend_id'] = $friend_info['id'];
             $friend['end_time'] = $friend_info['end_time'];
+            $friend['heart_list'] = model('Friend')->pullHeartChange($room_id, $friend_info['id']);
             //获取麦上CP心动值列表
-            $heart_list = db::name('vs_user_friending_heart')->where(['room_id' => $room_id, 'friend_id' => $friend_info['id'], 'status' => 1])->order('heart_value', 'desc')->limit(3)->select();
-            if($heart_list){
-                $heart_list_data = [];
-//                $heart_list = $heart_list->toArray();
-                $pit_number_array_reverse = [0=>[2,5],1=>[1,6],2=>[3,4]];
-                foreach($heart_list as $k=>$v){
-                    $heart_list_data[$k]['heartId'] = $v['id'];
-                    $pitnum1 = db::name('vs_room_pit')->where(['room_id' =>$room_id, 'user_id' => $v['user1_id']])->value('pit_number');
-                    $pitnum2 = db::name('vs_room_pit')->where(['room_id' =>$room_id, 'user_id' => $v['user2_id']])->value('pit_number');
-                    if(in_array($pitnum1,$pit_number_array_reverse[$k]) && in_array($pitnum2,$pit_number_array_reverse[$k])){
-                        $heart_list_data[$k]['heartNum'] = $v['heart_value'];
-                    }else{
-                        $heart_list_data[$k]['heartNum'] = 0;
-                    }
-                }
-                $friend['heart_list'] =$heart_list_data;
-            }else{
-                $friend['heart_list'] = [];
-            }
+//            $heart_list = db::name('vs_user_friending_heart')->where(['room_id' => $room_id, 'friend_id' => $friend_info['id'], 'status' => 1])->order('heart_value', 'desc')->limit(3)->select();
+//            if($heart_list){
+//                $heart_list_data = [];
+////                $heart_list = $heart_list->toArray();
+//                $pit_number_array_reverse = [0=>[2,5],1=>[1,6],2=>[3,4]];
+//                foreach($heart_list as $k=>$v){
+//                    $heart_list_data[$k]['heartId'] = $v['id'];
+//                    $pitnum1 = db::name('vs_room_pit')->where(['room_id' =>$room_id, 'user_id' => $v['user1_id']])->value('pit_number');
+//                    $pitnum2 = db::name('vs_room_pit')->where(['room_id' =>$room_id, 'user_id' => $v['user2_id']])->value('pit_number');
+//                    if(in_array($pitnum1,$pit_number_array_reverse[$k]) && in_array($pitnum2,$pit_number_array_reverse[$k])){
+//                        $heart_list_data[$k]['heartNum'] = $v['heart_value'];
+//                    }else{
+//                        $heart_list_data[$k]['heartNum'] = 0;
+//                    }
+//                }
+//                $friend['heart_list'] =$heart_list_data;
+//            }else{
+//                $friend['heart_list'] = [];
+//            }
         }
         return $friend;
     }
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 66bb882..4f72e09 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -98,6 +98,16 @@ class RoomPit extends Model
             ];
             model('Tencent')->batchsendmsg($remind_user,json_encode($content));
         }
+        $reslut = db::name('vs_room_pit_apply')->where(['user_id' => $user_id, 'room_id' => $room_id, 'status' => 0])->delete();
+        if($reslut){
+            $count = db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count();
+            //申请上麦推送消息（数据重置）
+            $text = [
+                'text' => '申请上麦',
+                'count' => $count
+            ];
+            model('Chat')->sendMsg(1034,$room_id,$text);
+        }
         return  ['code' => 1, 'msg' => '上麦成功', 'data' => null];
     }