bug修改

application/api/model/BlindBoxTurntableGift.php

@@ -23,18 +23,18 @@ class BlindBoxTurntableGift extends Model
     public function get_gift_list($gift_bag_id,$room_id)
     {
         $box = db::name('vs_gift_bag')->where('id',$gift_bag_id)->find();
-        $gifts = db::name('vs_gift_bag_detail')->where('gift_bag_id',$gift_bag_id)->order("id desc")->select();
+        $gifts = db::name('vs_gift_bag_detail')->alias('a')
+            ->field('a.*,aa.gid,aa.gift_name,aa.base_image,aa.play_image,aa.gift_price')
+            ->join('vs_gift aa','a.foreign_id = aa.gid')
+            ->where('gift_bag_id',$gift_bag_id)->order("gift_price desc")->select();
         $gift_list = [];
         foreach ($gifts as $key => $value) {
-            $gift_data = db::name('vs_gift')->where('gid',$value['foreign_id'])->where('delete_time',0)->find();
+            $gift_list[$key]['number'] = $key;
-            if($gift_data){
+            $gift_list[$key]['gift_id'] = $value['gid'];
-                $gift_list[$key]['number'] = $key;
+            $gift_list[$key]['gift_name'] = $value['gift_name'];
-                $gift_list[$key]['gift_id'] = $gift_data['gid'];
+            $gift_list[$key]['base_image'] = $value['base_image'];
-                $gift_list[$key]['gift_name'] = $gift_data['gift_name'];
+            $gift_list[$key]['play_image'] = $value['play_image'];
-                $gift_list[$key]['base_image'] = $gift_data['base_image'];
+            $gift_list[$key]['gift_price'] = $value['gift_price'];
-                $gift_list[$key]['play_image'] = $gift_data['play_image'];
-                $gift_list[$key]['gift_price'] = $gift_data['gift_price'];
-            }
         }
         $ext = json_decode($box['ext'],true);
         $box_gift = Db::name('vs_gift')->where('gid',$ext['gift_id'])->find();
@@ -474,7 +474,16 @@ class BlindBoxTurntableGift extends Model
         }
         //用户充值金额
         $user_recharge_money = db::name('vs_user_recharge')->where(['user_id'=>$user_id,'pay_status'=>2])->sum('money');
-        if($user_recharge_money < $fun_activities_recharge_restrictions){
+        //内测用户
+        //先从cache中获取
+        $inside_uid = Cache::get('inside_uid');
+        if(!$inside_uid){
+            $inside_uid = get_system_config_value('inside_uid');
+            //缓存 并设置缓存时间
+            Cache::set('inside_uid',$inside_uid,3600);
+        }
+        $inside_uid = explode(',',$inside_uid);
+        if(($user_recharge_money < $fun_activities_recharge_restrictions) && !in_array($user_id,$inside_uid)){
             return ['code' => 0, 'msg' => '充值金额不足', 'data' => null];
         }
         foreach ($gift_bag as $bag){

application/api/model/Decorate.php

@@ -647,6 +647,15 @@ class Decorate extends Model
                     'end_time' => date('Y-m-d H:00:00', time()),
                     'createtime' => time()
                 ]);
+                //推送消息
+                $FromUserInfo = db::name('vs_user')->where(['id' => $uid])->find();
+                $text = $FromUserInfo['nickname'] . ' 在本房间使用了房间热度卡 提升房间'.$increase_hot_value.'热度';
+                $text = [
+                    'FromUserInfo' => $FromUserInfo,
+                    'text' => $text
+                ];
+                //聊天室推送系统消息
+                model('Chat')->sendMsg(1005,$room_id,$text);
             }else{
                 $map = [
                     'user_id' => $uid,
@@ -688,6 +697,15 @@ class Decorate extends Model
                     'end_time' => date('Y-m-d H:00:00', time()),
                     'createtime' => time()
                 ]);
+                //推送消息
+                $FromUserInfo = db::name('vs_user')->where(['id' => $uid])->find();
+                $text = $FromUserInfo['nickname'] . ' 在本房间使用了房间热度卡 提升房间'.$increase_hot_value_all.'热度';
+                $text = [
+                    'FromUserInfo' => $FromUserInfo,
+                    'text' => $text
+                ];
+                //聊天室推送系统消息
+                model('Chat')->sendMsg(1005,$room_id,$text);
             }
             // 提交事务
             Db::commit();