From 06059ac9cc4510eaee0751b6e0f92d35e6855f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 21 Nov 2025 17:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A3=85=E6=89=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Decorate.php         | 198 ++++++++++-----------
 application/guildadmin/controller/Room.php |   1 -
 2 files changed, 99 insertions(+), 100 deletions(-)

diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index 1320f00..5bc8012 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -376,121 +376,121 @@ class Decorate extends Model
      * @param $id 对象id
      * @param $type 装扮类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号
      */
-//    public function user_decorate_detail($id, $type){
-//        //根据$type 组装查询条件
-//        $reslut = "";
-//        if($type == 7){//7房间靓号 8工会靓号
-//            $room = db::name('vs_room')->where('id', $id)->field('user_id,room_number')->find();
-//            if(empty($room)){
-//                return $reslut;
-//            }
-//            $map = [
-//                'user_id' => $room['user_id']??0,
-//                'type' => $type,
-//                'is_using' => 1
-//            ];
-//            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $room['room_number'];
-//        }elseif($type == 8){
-//            $guild = db::name('vs_guild')->where('id', $id)->field('user_id,guild_special_id')->find();
-//            $map = [
-//                'user_id' => $guild['user_id']??0,
-//                'type' => $type,
-//                'is_using' => 1
-//            ];
-//            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $guild['guild_special_id'];
-//        }elseif($type == 6){
-//            $map = [
-//                'user_id' => $id??0,
-//                'type' => $type,
-//                'is_using' => 1
-//            ];
-//            $user_code = db::name('user')->where('id', $id)->value('user_code');
-//            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $user_code;
-//        }else{
-//            $map = [
-//                'user_id' => $id??0,
-//                'type' => $type,
-//                'is_using' => 1
-//            ];
-//            $did = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('did');
-//            if(empty($did)){
-//                $reslut = '';//返回数据
-//            }else{
-//                if($type == 9){
-//                    $reslut = db::name('vs_decorate')->where('did', $did)->value('base_image');
-//                }else{
-//                    $reslut = db::name('vs_decorate')->where('did', $did)->value('play_image');
-//                }
-//            }
-//        }
-//        return $reslut;
-//
-//    }
-
     public function user_decorate_detail($id, $type){
         //根据$type 组装查询条件
         $reslut = "";
-        $map = [
-            'type' => $type,
-            'is_using' => 1
-        ];
         if($type == 7){//7房间靓号 8工会靓号
             $room = db::name('vs_room')->where('id', $id)->field('user_id,room_number')->find();
             if(empty($room)){
                 return $reslut;
             }
-            $map['user_id'] = $room['user_id'];
-            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
-            if(empty($user_decorate)){
-                return $reslut;
-            }
-            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
-                return $reslut;
-            }
-            $reslut = $user_decorate['special_num'] ?? $room['room_number'];
+            $map = [
+                'user_id' => $room['user_id']??0,
+                'type' => $type,
+                'is_using' => 1
+            ];
+            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $room['room_number'];
         }elseif($type == 8){
             $guild = db::name('vs_guild')->where('id', $id)->field('user_id,guild_special_id')->find();
-            if(empty($guild)){
-                return $reslut;
-            }
-            $map['user_id'] = $guild['user_id'];
-            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
-            if(empty($user_decorate)){
-                return $reslut;
-            }
-            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
-                return $reslut;
-            }
-            $reslut = $user_decorate['special_num'] ?? $guild['guild_special_id'];
+            $map = [
+                'user_id' => $guild['user_id']??0,
+                'type' => $type,
+                'is_using' => 1
+            ];
+            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $guild['guild_special_id'];
         }elseif($type == 6){
+            $map = [
+                'user_id' => $id??0,
+                'type' => $type,
+                'is_using' => 1
+            ];
             $user_code = db::name('user')->where('id', $id)->value('user_code');
-            if(empty($user_code)){
-                return $reslut;
-            }
-            $map['user_id'] = $id;
-            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
-            if(empty($user_decorate)){
-                return $reslut;
-            }
-            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
-                return $reslut;
-            }
-            $reslut = $user_decorate['special_num'] ?? $user_code;
+            $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $user_code;
         }else{
-            $map['user_id'] = $id;
-            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
-            if(empty($user_decorate)){
-                return $reslut;
-            }
-            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
-                return $reslut;
-            }
-            if($type == 9 || $type == 10 || $type == 11){
-                $reslut = db::name('vs_decorate')->where('did', $user_decorate['did'])->value('base_image');
+            $map = [
+                'user_id' => $id??0,
+                'type' => $type,
+                'is_using' => 1
+            ];
+            $did = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('did');
+            if(empty($did)){
+                $reslut = '';//返回数据
             }else{
-                $reslut = db::name('vs_decorate')->where('did', $user_decorate['did'])->value('play_image');
+                if($type == 9){
+                    $reslut = db::name('vs_decorate')->where('did', $did)->value('base_image');
+                }else{
+                    $reslut = db::name('vs_decorate')->where('did', $did)->value('play_image');
+                }
             }
         }
         return $reslut;
+
     }
+
+//    public function user_decorate_detail($id, $type){
+//        //根据$type 组装查询条件
+//        $reslut = "";
+//        $map = [
+//            'type' => $type,
+//            'is_using' => 1
+//        ];
+//        if($type == 7){//7房间靓号 8工会靓号
+//            $room = db::name('vs_room')->where('id', $id)->field('user_id,room_number')->find();
+//            if(empty($room)){
+//                return $reslut;
+//            }
+//            $map['user_id'] = $room['user_id'];
+//            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
+//            if(empty($user_decorate)){
+//                return $reslut;
+//            }
+//            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
+//                return $reslut;
+//            }
+//            $reslut = $user_decorate['special_num'] ?? $room['room_number'];
+//        }elseif($type == 8){
+//            $guild = db::name('vs_guild')->where('id', $id)->field('user_id,guild_special_id')->find();
+//            if(empty($guild)){
+//                return $reslut;
+//            }
+//            $map['user_id'] = $guild['user_id'];
+//            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
+//            if(empty($user_decorate)){
+//                return $reslut;
+//            }
+//            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
+//                return $reslut;
+//            }
+//            $reslut = $user_decorate['special_num'] ?? $guild['guild_special_id'];
+//        }elseif($type == 6){
+//            $user_code = db::name('user')->where('id', $id)->value('user_code');
+//            if(empty($user_code)){
+//                return $reslut;
+//            }
+//            $map['user_id'] = $id;
+//            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
+//            if(empty($user_decorate)){
+//                return $reslut;
+//            }
+//            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
+//                return $reslut;
+//            }
+//            $reslut = $user_decorate['special_num'] ?? $user_code;
+//        }else{
+//            $map['user_id'] = $id;
+//            $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
+//            if(empty($user_decorate)){
+//                return $reslut;
+//            }
+//            if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
+//                return $reslut;
+//            }
+//            if($type == 9 || $type == 10 || $type == 11){
+//                $reslut = db::name('vs_decorate')->where('did', $user_decorate['did'])->value('base_image');
+//            }else{
+//                $reslut = db::name('vs_decorate')->where('did', $user_decorate['did'])->value('play_image');
+//            }
+//        }
+//        return $reslut;
+//    }
 }
diff --git a/application/guildadmin/controller/Room.php b/application/guildadmin/controller/Room.php
index 80bbd2d..b1b2a39 100644
--- a/application/guildadmin/controller/Room.php
+++ b/application/guildadmin/controller/Room.php
@@ -42,7 +42,6 @@ class Room extends GuildAdmin
     // 房间列表
     public function index()
     {
-        echo model('api/Decorate')->user_decorate_detail($room_data['id'],7);
         $guild_id = $this->guildId;
         $page = input('page', 1);
         $page_limit = input('page_limit', 30);