From 33353e938da18c9feb34aa48b1d29ebb717a4e49 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, 9 Sep 2025 17:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E9=97=B4=E7=81=AB?=
 =?UTF-8?q?=E7=83=AD=E5=80=BC=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Chat.php                   |  3 +++
 application/api/model/Room.php                   | 11 ++++++++---
 application/cron/controller/PerformPerSecond.php |  9 +++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/application/api/model/Chat.php b/application/api/model/Chat.php
index bd07a73..6830fab 100644
--- a/application/api/model/Chat.php
+++ b/application/api/model/Chat.php
@@ -117,6 +117,9 @@ class Chat extends Model
         //直播群成员在离线状态变更
         // RoomMemberOffline = 1058,
 
+        //清空个人魅力
+        // ClearUserCharm = 1059,
+
 
 
 
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index fbc8a07..f7d2bd7 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1715,12 +1715,17 @@ class Room extends Model
                     }
                 }
             }
+            //发送消息
+            $text['text'] = '清除魅力成功';
+            model('Chat')->sendMsg(1021,$room_id,$text);
         }else{
             $dd = db::name('vs_room_user_charm')->where(['room_id' => $room_id,'user_id' => $uid])->update(['charm' => 0,'clear_time' => time()]);
+            //发送消息
+            $text['text'] = '清除魅力成功';
+            $text['user_id'] = $uid;
+            model('Chat')->sendMsg(1059,$room_id,$text);
         }
-        //发送消息
-        $text['text'] = '清除魅力成功';
-        model('Chat')->sendMsg(1021,$room_id,$text);
+
         //1-禁麦位，2-清空消息，3-清空魅力值，4-加入黑名单，5-踢出房间，6-关闭麦克风，7-申请上麦，8-同意上麦，9-拒绝上麦，10-点歌，11-开启PK',
         model('Room')->room_operation_record($user_id,$room_id,3);
         return ['code' => 1, 'msg' => '成功', 'data' => null];
diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php
index 2c94d7b..ce554f5 100644
--- a/application/cron/controller/PerformPerSecond.php
+++ b/application/cron/controller/PerformPerSecond.php
@@ -165,8 +165,9 @@ class PerformPerSecond
 
     //房间火热值更新
     public function room_hot_update(){
-        $room_id_list = db::name('vs_room')->field('id,room_id')->select();
-        $room_list = db::name('vs_room_hot_value_log')->field('room_id,sum(value) as value')->group('room_id')->select();
+        $room_id_list = db::name('vs_room_hot_value_log')->field('id,room_id')->select();
+        $room_list = db::name('vs_room_hot_value_log')->field('room_id,sum(hot_value) as value')->group('room_id')->select();
+
         if($room_list){
             $data_count = 0;
             $data_room_list = [];
@@ -196,10 +197,10 @@ class PerformPerSecond
             }
             foreach ($room_id_list as $v){
                 if(in_array($v['room_id'],$data_room_list)){
-                    db::name('vs_room')->where('id',$v['id'])->delete();
+                    db::name('vs_room_hot_value_log')->where('id',$v['id'])->delete();
                 }
             }
-            echo "Pk房PK结束惩罚倒计时结束断开操作-共". $data_count . "条数据\n";
+            echo "房间火热值更新操作-共". $data_count . "条数据\n";
         }
     }