首页房间列表和搜索调整/配置清理

application/api/controller/Guild.php

@@ -118,7 +118,7 @@ class Guild extends Api
         $partyOnlineRes = $roomService->getPartyUserList($partyParams);
         $onlineData = isset($partyOnlineRes['data']) ? $partyOnlineRes['data'] : [];
         if (!empty($partyInfo)) {
-            $partyInfo['user_list'] = isset($onlineData['user_list']) ? $onlineData['user_list'] : [];
+            $partyInfo['user_list'] = isset($onlineData['member_list']) ? $onlineData['member_list'] : [];
             $partyInfo['online_num'] = isset($onlineData['online_num']) ? $onlineData['online_num'] : 0;
             // 派对类型
             $partyTypeName = "普通房";

application/api/controller/Index.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\service\RoomService;
 use fast\Random;
 use think\Collection;
 use \think\Log;
@@ -406,24 +407,26 @@ class Index extends Api
         $partyList = collection($partyList)->toArray();
         if (!empty($partyList)) {//在线信息
             $partyListIds = array_column($partyList,'id');
-            $tenimService = new TenimService();
+            /*$tenimService = new TenimService();
             $partyParams = ['party_ids'=>$partyListIds];
-            $partyRes = $tenimService->getRoomUser($partyParams);
-            if ($partyRes['status'] == 1) {
-                foreach ($partyList as $pKey => &$pVal) {
-                    // 派对类型
-                    $partyTypeName = "普通房";
-                    if($pVal["party_type"]) {
-                        $partyTypeName = \app\common\model\PartyType::where(["id"=>$pVal["party_type"]])->value("name");
-                    }
-                    $mod = isset($pVal["party_type"])?intval($pVal["party_type"])%5:1;
-                    $pVal["party_type_color"] = $mod == 0?5:$mod;
-                    $pVal["type_name"] = $partyTypeName;
-                    if (isset($partyRes['data'][$pVal['id']])) {
-                        $pVal['member_list'] = $partyRes['data'][$pVal['id']]['member_list'];
-                        $pVal['online_num'] = $partyRes['data'][$pVal['id']]['online_num'];
-                    }
+            $partyRes = $tenimService->getRoomUser($partyParams);*/
+            /*if ($partyRes['status'] == 1) {
+
+            }*/
+            $roomService = new RoomService();
+            foreach ($partyList as $pKey => &$pVal) {
+                // 派对类型
+                $partyTypeName = "普通房";
+                if($pVal["party_type"]) {
+                    $partyTypeName = \app\common\model\PartyType::where(["id"=>$pVal["party_type"]])->value("name");
                 }
+                $mod = isset($pVal["party_type"])?intval($pVal["party_type"])%5:1;
+                $pVal["party_type_color"] = $mod == 0?5:$mod;
+                $pVal["type_name"] = $partyTypeName;
+                $userDataResult = $roomService->getPartyUserList(['party_id'=>$pVal['id']]);
+                $userDataRes = isset($userDataResult['data']) ? $userDataResult['data'] : [];
+                $pVal['member_list'] = isset($userDataRes['member_list']) ? $userDataRes['member_list'] : [];
+                $pVal['online_num']  = isset($userDataRes['online_num']) ? $userDataRes['online_num'] : [];
             }
         }
         // 家族

application/api/controller/Money.php

@@ -786,7 +786,7 @@ class Money extends Common
         if ($sound_coin > 0) {
             $scoin = $sound_coin;
             // 获取配置信息
-            $conf = config("site.soundcoinTojewel");
+            $conf = 100;//config("site.soundcoinTojewel");
             $exchangeMoney = round($sound_coin * ($conf / 100));
             if ($exchangeMoney < 1) $this->error(__('声币兑换数量太小啦！'));
         } else {
@@ -863,7 +863,7 @@ class Money extends Common
         if ($sound_coin > 0) {
             $scoin = $sound_coin;
             // 获取配置信息
-            $conf = config("site.soundcoinTomoney");
+            $conf = 100;//config("site.soundcoinTomoney");
             $exchangeMoney = round(($sound_coin * ($conf / 100)) / 100, 2);
             if ($exchangeMoney < 0.01) $this->error(__('声币兑换数量太小啦！'));
         } else {

application/api/controller/Usercenter.php

@@ -1160,4 +1160,43 @@ class UserCenter extends Common
             $this->error($e->getMessage());
         }
     }
+
+    /**
+     * 提现
+     * @return void
+     */
+    public function withdrawal()
+    {
+        try {
+            $withdrawConfigId = $this->request->param('id',0);
+            $money = $this->request->param('money',0.00);
+            $userId = $this->auth->id;
+            $isAnchor = $this->auth->is_anchor;
+            if (empty($withdrawConfigId) && empty($money)) {
+                throw new Exception('参数错误');
+            }
+            //只有主播可以提现
+            if ($isAnchor != 2) {
+                throw new Exception('您不是主播不允许提现');
+            }
+            $data = [
+                'user_id'       => $userId,//用户ID
+                'money'         => '',//金额
+                'handingfee'    => '',//手续费
+                'taxes'         => '',//税费
+                'type'          => '',//类型
+                'account'       => '',//提现账户
+                'name'          => '',//真实姓名
+                'memo'          => '',//备注
+                'orderid'       => '',//订单号
+                'transactionid' => '',//流水号
+                'status'        => '',//状态:created=申请中,successed=成功,rejected=已拒绝
+                'transfertime'  => '',//转账时间
+                'createtime'    => '',//添加时间
+            ];
+            $this->success('操作成功待审核');
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
 }

application/common/service/RoomService.php

@@ -106,9 +106,9 @@ class RoomService
             $partyData = $this->model->field($field)->where($where)->select();
             if (!empty($partyData)) {
                 //获取房间用户信息
-                $tenimService = new TenimService();
+                /*$tenimService = new TenimService();
                 $userParams = ['party_ids' => $partyIds];
-                $userImRes = $tenimService->getRoomUser($userParams);
+                $userImRes = $tenimService->getRoomUser($userParams);*/
                 foreach($partyData as $k => $v) {
                     $roomType = $v['room_type'];
                     $roomTypeStr = isset($this->roomTypeArr[$roomType]) ? $this->roomTypeArr[$roomType] : '';
@@ -139,20 +139,17 @@ class RoomService
                     $foreachData = info_domain_image($foreachData,['party_logo']);
                     //$userIds = $this->redis->zRange("party_user_".$foreachData["id"],0,-1);
                     if ($hasdata) {
-                        $field = 'user_id,avatar';
-                        $fieldArr = explode(',',$field);
+                        /*$field = 'user_id,avatar';
+                        $fieldArr = explode(',',$field);*/
                         /*$userWhere['id'] = ['in', $userIds];
                         $userModel = new \app\common\model\User();
                         $userData = $userModel->field($field)->where($userWhere)->select();*/
-                        $userDataRes = isset($userImRes['data'][$v['id']]) ? $userImRes['data'][$v['id']] : [];
+                        $userDataResult = $this->getPartyUserList(['party_id'=>$v['id']]);
+                        $userDataRes = isset($userDataResult['data']) ? $userDataResult['data'] : [];
                         $userData = isset($userDataRes['member_list']) ? $userDataRes['member_list'] : [];
                         $userDatas = [];
                         if (!empty($userData)) {
-                            foreach($userData as $key => $value) {
-                                foreach ($fieldArr as $fieldk => $fieldv) {
-                                    $userDatas[$key][$fieldv] = $value[$fieldv];
-                                }
-                            }
+                            $userDatas = $userData;
                             $userDatas = list_domain_image($userDatas,['avatar']);
                         }
                         $partyUserList = [
@@ -219,7 +216,7 @@ class RoomService
         try {
             $partyId = isset($params['party_id']) ? $params['party_id'] : 0;
             $userIds = $this->redis->zRange("party_user_".$partyId,0,-1);
-            $field = 'id,avatar';
+            $field = 'id,avatar,nickname';
             $fieldArr = explode(',',$field);
             $userWhere['id'] = ['in', $userIds];
             $userModel = new \app\common\model\User();
@@ -234,7 +231,7 @@ class RoomService
                 $userDatas = list_domain_image($userDatas,['avatar']);
             }
             $partyUserList = [
-                'user_list' => $userDatas,
+                'member_list' => $userDatas,
                 'online_num' => count($userData),
             ];
             $result['data'] = $partyUserList;

application/extra/site.php

@@ -47,11 +47,6 @@ return [
     'desc' => '更新时间：2023年08月20日 19:25:40',
     'versionCode' => '1',
     'boxexp' => '<p><span style="font-size: 18px;">1、使用钻石可以购买礼盒，开启礼盒可以随机获得一款礼物，如果赠送给主播或者他人，则对方可以受到此礼物实际价值的热度值和收益；</span></p><p><span style="font-size: 18px;">2、购买后可获得等同于礼盒开出礼物价值的等级经验值，排行榜贡献值等同于主播获得的实际礼物价值；</span></p><p><span style="font-size: 18px;">3、礼盒中获得礼物概率如下表</span></p><p><img src="https://bansheng-1304213176.file.myqcloud.com/uploads/20210419/829ca9ecc423a8649b3d2873b49beaad.png" style="width: 320px;"/></p><p><span style="font-size: 18px;">4、礼盒仅供娱乐交流使用，不得用于任何形式的盈利活动；</span></p><p><span style="font-size: 18px;">5、请通过官方渠道参与本活动，禁止一切线下交易，官方将对各类以盈利为目的的交易行为进行严厉打击；</span></p><p><span style="font-size: 18px;">6、任何影响“礼盒”公平性的操作，官方有权取消用户参与本活动的资格，并对账号内收益进行回收，情节严重的，平台有权向违规用户索赔，并追究其法律责任；</span></p><p><span style="font-size: 18px;">7、本活动在法律允许的范围内，最终解释权归GG语音所有。</span></p>',
-    'soundCoin' => '80',
-    'giftCoin' => '100',
-    'drawSoundCoin' => '100',
-    'soundcoinTojewel' => '100',
-    'soundcoinTomoney' => '100',
     'boxGiftLogo' => '/uploads/20210427/0618608e4bada96a20ca60905a8259ef.png',
     'guildAgreement' => '<p class="MsoNormal" style="text-align:center"><span style="font-family:&quot;等线 Light&quot;;mso-ascii-theme-font:major-latin;mso-fareast-theme-font:'."\r\n"
         .'major-latin;mso-hansi-theme-font:major-latin"><span style="font-size: 18px;">签约须知</span><span></span></span></p><p class="MsoNormal"><span style="font-family: &quot;等线 Light&quot;; font-size: 18px;">《GG语音声优入驻公会条款》（以下简称为“本条款”）为您入驻公会必备签约条款，请在签约前仔细阅读并勾选同意，方可入驻公会</span><span style="font-size: 18px;"></span><span style="font-size: 18px;"></span><span style="font-size: 18px;"></span><span style="font-family:&quot;等线 Light&quot;;mso-ascii-theme-font:'."\r\n"