From 1318b6440b567d4a7ce9d5d26fdd0e58ef4eb80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Mon, 8 Sep 2025 18:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4.-=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E6=8E=92=E9=99=A4=E7=94=B5=E5=BD=B1?=
 =?UTF-8?q?=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/BlindBox.php | 11 ++++++++---
 application/adminapi/controller/Guild.php    |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php
index c27a750..4bc7ec4 100644
--- a/application/adminapi/controller/BlindBox.php
+++ b/application/adminapi/controller/BlindBox.php
@@ -86,9 +86,14 @@ class BlindBox extends adminApi
         //每期总抽奖花费（支出）
         $bag_data = db::name("vs_gift_bag")->field('id,name,ext')->where(['id'=>$gift_bag_id])->find();
         $ext = json_decode($bag_data['ext'],true);
-        $c_gift_id = $ext['gift_id'];
-        $c_gift_data = db::name('vs_gift')->where(['gid'=>$c_gift_id])->find();
-        $gift_price = $c_gift_data['gift_price']??0;
+
+        if($gift_bag_id == 13){
+            $gift_price = $ext['xlh_box_price']??0;
+        }else{
+            $c_gift_id = $ext['gift_id'];
+            $c_gift_data = db::name('vs_gift')->where(['gid'=>$c_gift_id])->find();
+            $gift_price = $c_gift_data['gift_price']??0;
+        }
         $total_cost = $total_count * $gift_price;
         //每期统计（收入/支出）
         if($total_cost==0 || $total_price==0){
diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index c8a714c..2af9731 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -170,7 +170,13 @@ class Guild extends adminApi
                 }
                 //会长是否有房间
                 $rid = 0;
-                $room_info = db::name('vs_room')->where('user_id', $user_id)->find();
+                $where = [
+                    'user_id' => $user_id,
+                    'delete_time' => 0
+                ];
+                $where['apply_status'] = 2;//1待审核 2审核通过 3审核失败
+                $where['type_id'] = ['<>',6];
+                $room_info = db::name('vs_room')->where($where)->find();
                 if($room_info){
                     $rid = $room_info['id'];
                 }