定版之后bug修改

application/api/model/Banner.php

@@ -9,11 +9,11 @@ class Banner extends Model
 {
     protected $table = 'fa_vs_banner';
     public $ShowType = [
-//        1 => '引导页',
-//        2 => '启动页',
+        1 => '引导页',
+        2 => '启动页',
         3 => '首页轮播图',
-        4 => '工会',
-        5 => '帮助反馈'
+        4 => '房间首页',
+        5 => '工会列表页广告位'
     ];
     //1纯展示 2文章 3房间 4个人主页 5外站'
     public $Type = [

application/api/model/BlindBoxTurntableGift.php

@@ -639,6 +639,8 @@ class BlindBoxTurntableGift extends Model
         }
         $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name');
         $FromUserInfo = Db::name('user')->where(['id'=>$blind_box_turntable['user_id']])->find();
+        $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($blind_box_turntable['user_id']);//财富图标
+        $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($blind_box_turntable['user_id']);//魅力图标
         $user_nickname = $FromUserInfo['nickname'];
         $textMessage = $user_nickname;
         $text_message = [];
@@ -650,6 +652,7 @@ class BlindBoxTurntableGift extends Model
             $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
             $textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
             $play_image[] = $draw_gift['play_image'];
+            $gift_names[] = $draw_gift['gift_name'];
 
             $text_message = $user_nickname . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $draw_gift['gift_name'] . 'X' . $value['count']."\n";
             if($draw_gift['is_public_server'] == 1) {
@@ -675,6 +678,7 @@ class BlindBoxTurntableGift extends Model
             'ToUserInfos' => $ToUserInfos,
             'GiftInfo' => [
                 'play_image' => implode(',',$play_image),
+                'gift_name' => implode(',',$gift_names),
             ],
             'text' => $textMessage
         ];

application/api/model/BlindBoxTurntableGiftDraw.php

@@ -886,11 +886,7 @@ class BlindBoxTurntableGiftDraw extends Model
         $cacheKey = 'xlh_config_13';
         return Cache::remember($cacheKey, function() {
             $xlh_box = db::name('vs_gift_bag')->where('id', 13)->find();
-            $return_data = $xlh_box ? json_decode($xlh_box['ext'], true) : [];
-            if($xlh_box){
-                $return_data['gift_bag_name'] = $xlh_box['gift_bag_name'];
-            }
-            return $return_data;
+            return $xlh_box ? json_decode($xlh_box['ext'], true) : [];
         }, 3600); // 缓存1小时
     }
 

application/api/model/GiveGift.php

@@ -411,11 +411,15 @@ class GiveGift extends Model
 
                             // 推送文字消息 (格式: 张三 送给 李四 趣味礼物 礼物名1 X2，礼物2 X4)
                             $textMessage = $FromUserInfo['nickname'] . ' 送给 ' . $ToUserInfo['nickname'].' 趣味礼物 ' . implode('，', $giftTextList);
+                            foreach ($gift_box as $gv) {
+
+                            }
+                            $box_gift_info =
                             $textData = [
                                 'FromUserInfo' => $FromUserInfo,
-    //                            'ToUserInfo' => $ToUserInfo,
-    //                            'GiftInfo' => $gift_info,
-    //                            'GiftNum' => $num,
+                                'ToUserInfo' => $ToUserInfo,
+                                'GiftInfo' => $gift_box,
+                                'GiftNum' => $num,
                                 'text' => $textMessage
                             ];
                             // 聊天室推送文字消息