更新

application/common/controller/BaseCom.php

@@ -22,7 +22,7 @@ class BaseCom extends Controller
         //检测系统是否维护中
         $is_maintenance = get_system_config_value('is_maintenance');
         if($is_maintenance == 2){
-            return V(203, '系统维护中');
+            return V(0, '系统维护中');
         }
         //检测是什么系统
         $system = input('system','');

application/common/controller/Push.php

@@ -70,6 +70,14 @@ class Push
    //推送系统消息
     const PUSH_SYSTEM_MESSAGE         = 7000;//推送系统消息
 
+    //房间盘推送
+    //巡乐会推送开启进度推送
+    const PUSH_ROOM_PAN_XLH_PROGRESS      = 8000;
+    //小时榜
+    const PUSH_ROOM_PAN_HOUR_PROGRESS     = 8001;
+    //红包
+    const PUSH_ROOM_PAN_RED_PROGRESS      = 8002;
+
     public $user_id, $room_id, $topic_room, $topic_client;
 
     public function __construct($user_id = 0, $room_id = 0)
@@ -269,12 +277,14 @@ class Push
 
 
     //    =======================================================================================================
-//   ========================================羽声使用开始=====================================================================
+//   ========================================秘地使用开始=====================================================================
 
     //横幅礼物通知
     public function giftBanner($gift_list)
     {
         $topic = 'qx_room_topic';
+        //数组重组下标从0开始
+        $gift_list = array_values($gift_list);
         $data = ['room_id' => $this->room_id, 'list' => $gift_list];
         $this->push(self::PUSH_GIFT_BANNER, $topic, $data);
     }
@@ -287,10 +297,27 @@ class Push
         $this->push(self::PUSH_SYSTEM_MESSAGE, $topic, $data);
     }
 
+    //巡乐会推送
+    public function xunlehui($data){
+        $topic = 'qx_xunlehui';
+        $this->push(self::PUSH_ROOM_PAN_XLH_PROGRESS, $topic, $data);
+    }
+
+    //小时榜推送
+    public function hourRanking($data){
+        $topic = 'qx_hour_ranking';
+        $this->push(self::PUSH_ROOM_PAN_HOUR_PROGRESS, $topic, $data);
+    }
+
+    //红包来了
+    public function redpacketArrive($data){
+        $topic = 'qx_redpacket_arrive';
+        $this->push(self::PUSH_ROOM_PAN_RED_PROGRESS, $topic, $data);
+    }
 
 
 
-//    =========================================羽声使用结束=====================================================
+//    =========================================秘地使用结束=====================================================
 //   =============================================================================================================
 
 

application/common/controller/adminApi.php

@@ -163,10 +163,10 @@ class adminApi extends Controller
             // 判断是否需要验证权限
             if (!$this->auth->match($this->noNeedRight)) {
                 // 判断控制器和方法是否有对应权限
-                if (!$this->auth->check($path)) {
-                    Hook::listen('admin_nopermission', $this);
-                    return  V(302,"你没有权限访问", url('index/login', []));
-                }
+//                if (!$this->auth->check($path)) {
+//                    Hook::listen('admin_nopermission', $this);
+//                    return  V(302,"你没有权限访问", url('index/login', []));
+//                }
             }
         }
 

application/common/model/UserWallet.php

@@ -73,7 +73,23 @@ class UserWallet extends Model
     const TRANSFER_COIN = 25;
     //好友转赠所得金币
     const RECEIVE_COIN = 26;
+    //小时榜获得金币
+    const HOUR_RANK_COIN = 27;
+    //新人充值好礼
+    const NEW_USER_CHARGE_GIFT = 28;
 
+    //发红包（金币）
+    const RED_PACKET_COIN = 32;
+    //发红包（钻石）
+    const RED_PACKET_DIAMOND = 29;
+    //抢红包（金币）
+    const RED_PACKET_COIN_RECEIVE = 30;
+    //抢红包（钻石）
+    const RED_PACKET_DIAMOND_RECEIVE = 31;
+    //红包剩余退回（金币），34-红包剩余退回（钻石）
+    const RED_PACKET_LEFT_COIN = 33;
+    //红包剩余退回（钻石）
+    const RED_PACKET_LEFT_DIAMOND = 34;
 
     //金币支出类型数组
     public  $coin_consumption_type_array = [
@@ -82,12 +98,14 @@ class UserWallet extends Model
         self::OPERATION_GIFT,
         self::GUILD_EXIT,
         self::HEADLINE_REWARD,
-        self::TRANSFER_COIN
+        self::TRANSFER_COIN,
+        self::RED_PACKET_COIN,
     ];
     //钻石支出类型数组
     public  $diamond_consumption_type_array = [
         self::OPERATION_WITHDRAW,
-        self::MONEY_CONVERSION
+        self::MONEY_CONVERSION,
+        self::RED_PACKET_DIAMOND
     ];
 
 
@@ -135,7 +153,15 @@ class UserWallet extends Model
             self::FINANCE_LEVEL_REWARD      => '财富等级奖励金币领取',
             self::DELETE_RELATION_COIN      => '删除关系扣金币',
             self::TRANSFER_COIN             => '赠送好友金币',
-            self::RECEIVE_COIN              => '好友转赠所得金币'
+            self::RECEIVE_COIN              => '好友转赠所得金币',
+            self::HOUR_RANK_COIN           => '小时榜获得金币',
+            self::NEW_USER_CHARGE_GIFT      => '新人充值好礼',
+            self::RED_PACKET_COIN           => '发红包（金币）',
+            self::RED_PACKET_DIAMOND        => '发红包（钻石）',
+            self::RED_PACKET_COIN_RECEIVE   => '抢红包（金币）',
+            self::RED_PACKET_DIAMOND_RECEIVE => '抢红包（钻石）',
+            self::RED_PACKET_LEFT_COIN      => '红包剩余退回（金币）',
+            self::RED_PACKET_LEFT_DIAMOND   => '红包剩余退回（钻石）',
         ];
         return $status[$type] ?? '';
     }