From 08a67d55e56cc77720ca46af5b85469d1d7581df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 8 Sep 2025 20:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=20K=E6=AD=8C=E6=88=BF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Room.php |  9 +++++++++
 application/api/model/Room.php      | 24 +++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php
index 88ff942..6790dfd 100644
--- a/application/api/controller/Room.php
+++ b/application/api/controller/Room.php
@@ -407,4 +407,13 @@ class Room extends BaseCom
         $reslut = model('Room')->room_online_list($room_id, $page, $limit);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+    //房间用户当前魅力值列表
+    public function room_user_charm_list()
+    {
+        $room_id = input('room_id', 0);
+        $user_id = input('user_id', '');
+        $reslut = model('Room')->room_user_charm_list($room_id, $user_id);
+        return V($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
 }
\ No newline at end of file
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index da5aacb..8f43a9c 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1792,7 +1792,7 @@ class Room extends Model
             db::name('vs_room_pit')->where(['pit_number' =>['>',10]])->update(['status' => 2]);
         }
 
-        if($type == 1 || $type == 3 || $type == 4){
+        if($type == 1 || $type == 3 || $type == 4 || $type == 7){
             //查询拍卖房的状态
             $room_auction = db::name('vs_room_auction')->where(['room_id' => $room_id,'status' => 2])->select();
             if($room_auction){
@@ -2578,4 +2578,26 @@ class Room extends Model
         }
         return $friend;
     }
+
+
+    //房间用户当前魅力值列表
+    public function room_user_charm_list($room_id, $user_id)
+    {
+        if($room_id == '' || $user_id == ''){
+            return ['code' => 0, 'msg' => '参数错误', 'data' => null];
+        }
+        $clear_time = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $user_id])->order('id', 'desc')->value('clear_time') ?? 0;
+        $list = db::name('vs_give_gift')->alias('a')
+            ->join('user b', 'a.user_id=b.id')
+            ->field('a.user_id,sum(a.total_price) as total_price,b.nickname,b.avatar,b.user_code')
+            ->where(['a.from_id' => $room_id, 'a.gift_user' => $user_id, 'a.createtime' => ['>',$clear_time],'a.from' => 2])->group('a.user_id')->select();
+        if($list){
+            foreach ($list as $k=>$v){
+                $v['charm'] = $v['total_price'] * get_system_config_value('coin_charm_exp');
+                $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
+                $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
+            }
+        }
+        return ['code' => 1, 'msg' => '操作成功', 'data' => $list];
+    }
 }
\ No newline at end of file