公会首页

application/api/controller/Guild.php

@@ -116,35 +116,15 @@ class Guild extends Api
      */
     public function getGuildInfoNew() {
         $guild_id = input("guild_id"); //公会ID
-        $is_member = 0;
         $user_id = $this->auth->id;
-        if($guild_id <= 0) {
-            $is_member = 1;
-            // 获取当前用户是否是公会成员
-            $idcardfind = \app\common\model\GuildJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
-            if($idcardfind) $this->error("您存在加入公会的申请，正在审核中，请耐心等待！");
 
-            $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id])->find();
-            if($memberfind) {
-                $guild_id = $memberfind->guild_id;
-            }
-
-            $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();
-
-            if(!$guild_id) {
-                $res["is_member"] = 2; // 是否为派对成员
-                $res["guild_status"] = isset($guildInfo['status']) ? (int)$guildInfo['status'] : -2; // 是否为派对成员
-                $this->success("获取成功！",$res);
-            }
-        }
 
         //结果
         $res = [];
 
         //公会信息
         $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where(["id"=>$guild_id])->find();
+        if(!$guildInfo) $this->error("公会信息获取失败！");
 
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
@@ -152,7 +132,6 @@ class Guild extends Api
             ->join("user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
 
-        if(!$guildInfo) $this->error("公会信息获取失败！");
 
         // 获取公会成员总数
         $guildMemberCount = \app\common\model\GuildMember::where(["guild_id"=>$guild_id])->count("id");
@@ -161,7 +140,7 @@ class Guild 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();
+        $partyInfo = \app\common\model\Party::field("id,party_logo,party_type,is_online,party_name")->where(["id"=>$guildInfo->party_id])->find();
 
         $partyParams = ['party_id' => $guildInfo->party_id];
         $roomService = new RoomService();
@@ -171,34 +150,28 @@ class Guild extends Api
             $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;
+            $partyInfo["type_name"] = '工会房';
         }
 
-        //获取公会角色
-        $userService =  new UserService();
-        $userParams = [
-            'user_id' => $user_id,
-            'guild_id' => $guild_id,
-        ];
-        $userRes = $userService->getGuildRole($userParams);
-        $guildStatus = isset($userRes['data']['guild_role']) ? $userRes['data']['guild_role'] : 4;
+
+
+        //获取公会角色 角色:0=成员,1=副会长,2=会长,3=非会员
+        $guildMember = \app\common\model\GuildMember::field('id,role')->where(['guild_id'=>$guild_id,'user_id'=>$this->auth->id])->find();
+        if (!empty($guildMember)) {
+            $guildRole = $guildMember['role'];
+        }else{
+            $guildRole = 3;
+        }
 
         // 返回参数拼接
         $res["guildInfo"] = $guildInfo; // 公会基本信息
-        $res["partyInfo"] = $partyInfo; // 派对悉尼下
+        $res["partyInfo"] = $partyInfo; // 派对基本信息
         $res["guildMemberInfo"] = $guildMemberInfo; // 成员列表
         $res["guildMemberCount"] = $guildMemberCount; // 成员总数
         $res["guilderInfo"] = $guilderInfo; // 会长
-        $res["is_member"] = $is_member; // 是否为派对成员
-        $res['guild_status'] = $guildStatus; //公会状态
-        $res['guild_role'] = $guildStatus; //公会角色:1工会长,2副会长,3成员,4非成员
+        $res['guild_role'] = $guildRole; //公会角色
         $this->success("获取成功！",$res);
     }
 

application/common/service/UserService.php

@@ -295,51 +295,7 @@ class UserService
         return $result;
     }
 
-    /**
-     * 获取用户家族角色
-     * @return void
-     */
-    public function getGuildRole($params=[])
-    {
-        $result = [
-            'status' => 1,
-            'msg' => '操作成功',
-            'data' => [],
-        ];
-        try {
-            $userId = isset($params['user_id']) ? $params['user_id'] : 0;
-            $guildId = isset($params['guild_id']) ? $params['guild_id'] : 0;
-            if (empty($userId) || empty($guildId)) {
-                throw new Exception('参数错误');
-            }
-            $guildWhere['id'] = $guildId;
-            $guild = model('Guild')->where($guildWhere)->find();
-            if (empty($guild)) {
-                throw new Exception('未找到公会信息');
-            }
-            $guildRole = 4;//家族角色：1组长,2副族长,3成员,4非成员
-            if ($userId == $guild['user_id']) {
-                $guildRole = 1;
-            }
-            $guildMemberWhere['guild_id'] = $guildId;
-            $guildMemberWhere['user_id'] = $userId;
-            $guildMember = model('GuildMember')->field('id,role')->where($guildMemberWhere)->find();
-            if (!empty($guildMember)) {
-                if ($guildMember['role'] == 0) {
-                    $guildRole = 3;
-                } elseif ($guildMember['role'] == 1) {
-                    $guildRole = 2;
-                }
-            }
-            $result['data'] = [
-                'guild_role' => $guildRole,
-            ];
-        } catch (Exception $e) {
-            $result['status'] = 0;
-            $result['msg'] = $e->getMessage();
-        }
-        return $result;
-    }
+
 
     /**
      * 更新用户消费/魅力/礼物数据