家族，删除派对概念

application/api/controller/Family.php

@@ -4,11 +4,9 @@ namespace app\api\controller;
 
 use app\common\controller\Api;
 use app\common\service\UserService;
-use fast\Random;
 use think\Db;
 use think\Exception;
 use Redis;
-use app\api\controller\Tenim;
 use app\common\service\RoomService;
 
 /**
@@ -30,7 +28,7 @@ class Family extends Api
             $whereOr['name'] = array('like', '%' . $search . '%');
             $whereOr['g_id'] = $search;
         }
-        $res = Db::name('guild')->field("id,g_id,user_id,party_id,name,image,desc,member")
+        $res = Db::name('guild')->field("id,g_id,user_id,group_id,name,image,desc,member")
             ->where($where)
             ->where(function ($query) use($whereOr) {
                 $query->whereOr($whereOr);
@@ -72,7 +70,7 @@ class Family extends Api
         $res = [];
 
         //公会信息
-        $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where(["id"=>$guild_id])->find();
+        $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,group_id,desc,notice,status")->where(["id"=>$guild_id])->find();
 
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
@@ -87,25 +85,13 @@ class Family extends Api
         // 获取会长信息
         $guilderInfo = \app\common\model\User::field("avatar,nickname,u_id")->where(["id"=>$guildInfo->user_id])->find();
 
-        // 获取房间信息
-        $partyInfo = \app\common\model\Party::field("id,party_logo,party_type,is_online,party_name,party_notice_detail")->where(["id"=>$guildInfo->party_id])->find();
 
-        // 派对类型
-        $partyTypeName = "普通房";
-        if($partyInfo["party_type"]) {
-            $partyTypeName = \app\common\model\PartyType::where(["id"=>$partyInfo["party_type"]])->value("name");
-        }
-
-        $mod = isset($partyInfo["party_type"])?intval($partyInfo["party_type"])%5:1;
-        $partyInfo["party_type_color"] = $mod == 0?5:$mod;
-        $partyInfo["type_name"] = $partyTypeName;
 
         // 返回参数拼接
         $res["guildInfo"] = $guildInfo; // 公会基本信息
         $res["guildMemberInfo"] = $guildMemberInfo; // 成员列表
         $res["guildMemberCount"] = $guildMemberCount; // 成员总数
         $res["guilderInfo"] = $guilderInfo; // 会长
-        $res["partyInfo"] = $partyInfo; // 派对悉尼下
         $res["is_member"] = $is_member; // 是否为派对成员
         $this->success("获取成功！",$res);
     }
@@ -128,7 +114,7 @@ class Family extends Api
 
             $guildWhere['user_id'] = $user_id;
             $guildWhere['status'] = ['in',[0,1]];
-            $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where($guildWhere)->find();
+            $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,group_id,desc,notice,status")->where($guildWhere)->find();
 
             if(!$guild_id) {
                 $res["is_member"] = 2; // 是否为派对成员
@@ -141,7 +127,7 @@ class Family extends Api
         $res = [];
 
         //公会信息
-        $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where(["id"=>$guild_id])->find();
+        $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,group_id,desc,notice,status")->where(["id"=>$guild_id])->find();
 
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
@@ -156,26 +142,6 @@ class Family extends Api
         // 获取会长信息
         $guilderInfo = \app\common\model\User::field("avatar,nickname,u_id")->where(["id"=>$guildInfo->user_id])->find();
 
-        // 获取房间信息
-        $partyInfo = \app\common\model\Party::field("id,party_logo,party_type,is_online,party_name,party_notice_detail")->where(["id"=>$guildInfo->party_id])->find();
-
-        $partyParams = ['party_id' => $guildInfo->party_id];
-        $roomService = new RoomService();
-        $partyOnlineRes = $roomService->getPartyUserList($partyParams);
-        $onlineData = isset($partyOnlineRes['data']) ? $partyOnlineRes['data'] : [];
-        if (!empty($partyInfo)) {
-            $partyInfo['user_list'] = isset($onlineData['member_list']) ? $onlineData['member_list'] : [];
-            $partyInfo['online_num'] = isset($onlineData['online_num']) ? $onlineData['online_num'] : 0;
-            // 派对类型
-            $partyTypeName = "普通房";
-            if(isset($partyInfo["party_type"])) {
-                $partyTypeName = \app\common\model\PartyType::where(["id"=>$partyInfo["party_type"]])->value("name");
-            }
-
-            $mod = isset($partyInfo["party_type"])?intval($partyInfo["party_type"])%5:1;
-            $partyInfo["party_type_color"] = $mod == 0?5:$mod;
-            $partyInfo["type_name"] = $partyTypeName;
-        }
 
         //获取家族角色
         $userService =  new UserService();
@@ -188,7 +154,6 @@ class Family extends Api
 
         // 返回参数拼接
         $res["guildInfo"] = $guildInfo; // 公会基本信息
-        $res["partyInfo"] = $partyInfo; // 派对悉尼下
         $res["guildMemberInfo"] = $guildMemberInfo; // 成员列表
         $res["guildMemberCount"] = $guildMemberCount; // 成员总数
         $res["guilderInfo"] = $guilderInfo; // 会长
@@ -656,35 +621,7 @@ class Family extends Api
         $memberInfo->updatetime = time();
         $res = $memberInfo->save();
         if($res) {
-            // 获取房间id
-            $party_id = $guildInfo->party_id;
-            // 添加房间管理员
-            $redis = new Redis();
-            $redisconfig = config("redis");
-            $redis->connect($redisconfig["host"], $redisconfig["port"]);
-            if ($redisconfig['redis_pwd']) {
-                $redis->auth($redisconfig['redis_pwd']);
-            }
-            if($redisconfig['redis_selectdb'] > 0){
-                $redis->select($redisconfig['redis_selectdb']);
-            }
-            // 获取成员用户信息
-            $memberuserInfo = \app\common\model\User::field("id,avatar,nickname,gender,level")->where('id',$memberInfo['user_id'])->find();
-            $data = [];
-            $data["user_id"] = $memberuserInfo->id;
-            $data["avatar"] = $memberuserInfo->avatar;
-            $data["nickname"] = $memberuserInfo->nickname;
-            $data["gender"] = $memberuserInfo->gender;
-            $data["level"] = $memberuserInfo->level;
-            $data["item"] = 1;
-            $data["time"] = 0;
-            $data["createtime"] = time();
-
-            $redis->hSet("party_manage_".$party_id,$memberuserInfo->id."-1",serialize($data));
 
-            // 腾讯im设置管理员
-//            $tenim = new Tenim();
-//            $tenim->setImManage($memberInfo['user_id'],$party_id);
 
             $this->success("设置成功！");
         } else {