From 70777b26a1e00169e3b45f392051d2e7a82ed3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 21 Oct 2025 18:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=98=E5=9C=B0=E6=96=B0=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=A0=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/GiveGift.php | 7 ++++++-
 application/adminapi/controller/Guild.php    | 5 +++++
 application/adminapi/controller/Room.php     | 3 ++-
 application/api/model/Decorate.php           | 6 +++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/application/adminapi/controller/GiveGift.php b/application/adminapi/controller/GiveGift.php
index 8610568..8a9abd2 100644
--- a/application/adminapi/controller/GiveGift.php
+++ b/application/adminapi/controller/GiveGift.php
@@ -199,6 +199,8 @@ class GiveGift extends adminApi
             $value['gift_user_earning'] = $earning_info ? $earning_info['gift_user_earning'] : 0;
             $value['room_owner_earning'] = $earning_info ? $earning_info['room_owner_earning'] : 0;
         }
+        //比例
+        $config = get_system_config();
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,
@@ -209,7 +211,10 @@ class GiveGift extends adminApi
                 'total_price' => $total_price,
                 'app_earning' => round($app_earning,2) ,
                 'receive_earning' => round($receive_earning,2),
-                'room_owner_earning' => round($room_owner_earning,2)
+                'room_owner_earning' => round($room_owner_earning,2),
+                'app_earning_ratio' => 100 - $config['room_gift_ratio'] - $config['room_author_ratio'],
+                'receive_earning_ratio' => $config['room_gift_ratio'] ?? 0,
+                'room_owner_earning_ratio' => $config['room_author_ratio'] ?? 0,
             ]
         ];
         return V(1,"成功", $return_data);
diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index 41a0d74..bfca4df 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -406,6 +406,8 @@ class Guild extends adminApi
             return V(0,"暂无数据");
         }
         $rum_lists = [];
+        //总流水
+        $total_consumption = 0;
         foreach ($list as $k=>$v){
             $search_stime = $search_stime_str;
             $search_etime = $search_etime_str;
@@ -441,15 +443,18 @@ class Guild extends adminApi
             //房间流水
             $rum_lists[$k]['consumption']= model('Room')->getRoomFlow($v['room_id'],$search_stime,$search_etime);
             $rum_lists[$k]['add_time'] = date('Y-m-d H:i:s',$v['createtime']);
+            $total_consumption += $rum_lists[$k]['consumption'];
         }
         usort($rum_lists, function($a, $b) {
             return $b['consumption'] - $a['consumption'];
         });
         //分页
         $rum_lists = array_slice($rum_lists, ($page-1)*$page_limit, $page_limit);
+
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,
+            'total_consumption' => $total_consumption,
             'count' => $count,
             'lists' => $rum_lists
         ];
diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php
index 593bfdf..60440a9 100644
--- a/application/adminapi/controller/Room.php
+++ b/application/adminapi/controller/Room.php
@@ -445,6 +445,8 @@ class Room extends adminApi
         }
         if($type_id!==''){
             $where['type_id'] = $type_id;
+        }else{
+            $where['type_id'] = ['<>',6];
         }
         if($label_id!==''){
             $where['label_id'] = $label_id;
@@ -460,7 +462,6 @@ class Room extends adminApi
         }
         //房间列表只展示 审核通过的房间
         $where['apply_status'] = 2;//1待审核 2审核通过 3审核失败
-        $where['type_id'] = ['<>',6];
         $count = db::name($this->table)->where($where)->count();
         $room_lists = db::name($this->table)->where($where)->page($page, $page_limit)->select();
         $lists = [];
diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index e3d6270..cf5e279 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -412,7 +412,11 @@ class Decorate extends Model
             if(empty($did)){
                 $reslut = '';//返回数据
             }else{
-                $reslut = db::name('vs_decorate')->where('did', $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;