调整家族

application/api/controller/Guild.php

@@ -109,7 +109,7 @@ class Guild extends Api
         // 获取公会成员总数
         $guildMemberCount = \app\common\model\GuildMember::where(["guild_id"=>$guild_id])->count("id");
         // 获取会长信息
-        //$guilderInfo = \app\common\model\User::field("avatar,nickname,u_id")->where(["id"=>$guildInfo->user_id])->find();
+        $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];
@@ -132,7 +132,7 @@ class Guild extends Api
         $res["partyInfo"] = $partyInfo; // 派对悉尼下
         $res["guildMemberInfo"] = $guildMemberInfo; // 成员列表
         $res["guildMemberCount"] = $guildMemberCount; // 成员总数
-        //$res["guilderInfo"] = $guilderInfo; // 会长
+        $res["guilderInfo"] = $guilderInfo; // 会长
         $res["is_member"] = $is_member; // 是否为派对成员
         $res['guild_status'] = $guildStatus; //家族状态
         $this->success("获取成功！",$res);

application/api/controller/Party.php

@@ -62,15 +62,15 @@ class Party extends Common
 
         if($room_type == 1) {
             // 2。开厅申请
-            $authInfo = \app\common\model\GuildApply::where(["user_id"=>$user_id])->find();
+            $authInfo = \app\common\model\Guild::where(["user_id"=>$user_id])->order('id desc')->find();
             if($authInfo) {
                 if($authInfo->status == 0) {
-                    $this->error("您的开厅申请还在这审核中...，请耐心等待！");
+                    $this->error("您的家族申请还在这审核中...，请耐心等待！");
                 } elseif($authInfo->status == -1) {
-                    $this->error("您的开厅申请审核未通过，请重新审核！");
+                    $this->error("您的家族申请已解散，请重新申请！");
                 }
             } else {
-                $this->error("请先申请开厅资质！");
+                $this->error("请先申请家族！");
             }
         }
 

application/api/controller/User.php

@@ -968,9 +968,8 @@ class User extends Api
                 'idcard' => $idCard,
                 'certify_id' => '',
                 'out_trade_no' => '',
-                'status' => 0,
+                'status' => 1,
                 'createtime' => time(),
-                'updatetime' => time()
             ];
             //开启事务
             Db::startTrans();