家族，微调

application/api/controller/Family.php

@@ -52,7 +52,7 @@ class Family extends Api
             $is_member = 1;
             // 获取当前用户是否是公会成员
             $idcardfind = \app\common\model\FamilyJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
-            if($idcardfind) $this->error("您存在加入公会的申请，正在审核中，请耐心等待！");
+            if($idcardfind) $this->error("您存在加入家族的申请，正在审核中，请耐心等待！");
 
             $memberfind = \app\common\model\FamilyMember::where(["user_id"=>$user_id,"status"=>1])->find();
             if($memberfind) $guild_id = $memberfind->guild_id;
@@ -75,7 +75,7 @@ class Family extends Api
             ->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
             ->join("hx_user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
-        if(!$guildInfo || !$guildMemberInfo) $this->error("公会信息获取失败！");
+        if(!$guildInfo || !$guildMemberInfo) $this->error("家族信息获取失败！");
 
         // 获取公会成员总数
         $guildMemberCount = \app\common\model\FamilyMember::where(["guild_id"=>$guild_id])->count("id");
@@ -105,7 +105,7 @@ class Family extends Api
             $is_member = 1;
             // 获取当前用户是否是公会成员
             $idcardfind = \app\common\model\FamilyJoinin::where(["user_id"=>$user_id,"status"=>0])->find();
-            if($idcardfind) $this->error("您存在加入公会的申请，正在审核中，请耐心等待！");
+            if($idcardfind) $this->error("您存在加入家族的申请，正在审核中，请耐心等待！");
 
             $memberfind = \app\common\model\FamilyMember::where(["user_id"=>$user_id,"status"=>1])->find();
             if($memberfind) $guild_id = $memberfind->guild_id;
@@ -132,7 +132,7 @@ class Family extends Api
             ->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
             ->join("hx_user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
-        if(!$guildInfo || !$guildMemberInfo) $this->error("公会信息获取失败！");
+        if(!$guildInfo || !$guildMemberInfo) $this->error("家族信息获取失败！");
 
         // 获取公会成员总数
         $guildMemberCount = \app\common\model\FamilyMember::where(["guild_id"=>$guild_id])->count("id");
@@ -175,7 +175,7 @@ class Family extends Api
 
 
             if(!$guild_name || !$guild_image){
-                throw new Exception("公会名和logo必填！");
+                throw new Exception("家族名和logo必填！");
             }
             $user_id = $this->auth->id;
 
@@ -184,7 +184,7 @@ class Family extends Api
                 //检查
                 $guildWhere['user_id'] = $user_id;
                 $guildWhere['status'] = ['in',[0,1]];
-                $guildData = model('Guild')->where($guildWhere)->find();
+                $guildData = model('Family')->where($guildWhere)->find();
                 if (!empty($guildData)) {
                     throw new Exception('您已创建过家族！');
                 }
@@ -199,7 +199,7 @@ class Family extends Api
                 // 获取公会信息
                 $guildInfo = \app\common\model\Family::where(["id"=>$guild_id])->find();
                 // 验证更新条件
-                if($user_id !== $guildInfo->user_id) throw new Exception("身份验证失败！您不是公会长，无权限更改！");
+                if($user_id !== $guildInfo->user_id) throw new Exception("身份验证失败！您不是族长，无权限更改！");
             }
 
             //传参信息
@@ -279,7 +279,7 @@ class Family extends Api
         if($idcardfind) $this->error("当前账号正在审核，请耐心等待！");
 
         $memberfind = \app\common\model\FamilyMember::where(["user_id"=>$user_id,"status"=>1])->find();
-        if($memberfind) $this->error("一个账号只能加入一个公会哟！");
+        if($memberfind) $this->error("一个账号只能加入一个家族哟！");
 
 
 
@@ -382,14 +382,14 @@ class Family extends Api
                 $res4 = \app\common\model\Family::where(["id"=>$guildInfo->id])->setInc("member");
                 if($res1 && $res2 && $res3 && $res4) {
                     // +message
-                    \app\common\model\Message::addMessage($joininInfo->user_id,"工会审核通知","恭喜，您的加入工会审核通过啦！工会ID：".$guildInfo->g_id);
+                    \app\common\model\Message::addMessage($joininInfo->user_id,"家族审核通知","恭喜，您的加入家族审核通过啦！");
                     Db::commit();
                     $this->success("已审核通过！");
                 }
             } else {
                 if($res1 && $res2) {
                     // +message
-                    \app\common\model\Message::addMessage($joininInfo->user_id,"工会审核通知","您的工会加入申请，会长审核拒绝，没关系，调整姿势再来一遍！");
+                    \app\common\model\Message::addMessage($joininInfo->user_id,"家族审核通知","您的家族加入申请，族长审核拒绝，没关系，调整姿势再来一遍！");
                     Db::commit();
                     $this->success("已审核拒绝！");
                 }
@@ -418,8 +418,8 @@ class Family extends Api
         try {
             $user_id = $this->auth->id;
             // 获取公会信息
-            $guildInfo = model('Guild')->where(["user_id"=>$user_id])->find();
-            if(!$guildInfo) throw new Exception('公会信息获取失败！');
+            $guildInfo = model('Family')->where(["user_id"=>$user_id])->find();
+            if(!$guildInfo) throw new Exception('家族信息获取失败！');
             // 先获取申请列表
             $where = [];
             $where["guild_id"] = $guildInfo->id;
@@ -480,7 +480,7 @@ class Family extends Api
             ->order("a.role","desc")
             ->select();
 
-        $role = [0=>'成员',1=>'副会长',2=>'会长'];
+        $role = [0=>'成员',1=>'副族长',2=>'族长'];
 
         if($guildMemberList) {
             foreach($guildMemberList as $k => &$v) {
@@ -581,7 +581,7 @@ class Family extends Api
         $guildInfo = \app\common\model\Family::where(["id"=>$guild_id])->find();
 
         // 验证更新条件
-        if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是公会长，无权限更改！");
+        if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是族长，无权限更改！");
 
         $memberInfo = \app\common\model\FamilyMember::where(["id"=>$member_id,'guild_id'=>$guild_id])->find();
         if(!$memberInfo) $this->error("会员信息查询失败！");
@@ -624,13 +624,13 @@ class Family extends Api
         // 获取公会信息
         $guildInfo = \app\common\model\Family::where(["id"=>$guild_id])->find();
         // 验证更新条件
-        if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是公会长，无权限更改！");
+        if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是族长，无权限更改！");
 
         $memberInfo = \app\common\model\FamilyMember::where(["id"=>$member_id,'guild_id'=>$guild_id])->find();
         if(!$memberInfo) $this->error("会员信息查询失败！");
 
         if($memberInfo['role'] == 2 || $memberInfo['user_id'] == $guildInfo['user_id']){
-            $this->error('会长不能被踢出工会');
+            $this->error('族长不能被踢出家族');
         }
 
         Db::startTrans();
@@ -680,7 +680,7 @@ class Family extends Api
                     ->autopage()
                     ->select();
                 if (!empty($list)) {
-                    $role = [0=>'成员',1=>'副会长',2=>'会长'];
+                    $role = [0=>'成员',1=>'副族长',2=>'族长'];
                     $guildMemberData = [];
                     foreach ($guildMember as $mKey => $mVal) {
                         $guildMemberData[$mVal['user_id']] = [
@@ -734,7 +734,7 @@ class Family extends Api
                 $where['user_id'] = $this->auth->id;
             }
             $field = 'id,status';
-            $guild = model('Guild')->field($field)->where($where)->find();
+            $guild = model('Family')->field($field)->where($where)->find();
             $this->success('获取成功', $guild);
         } catch (Exception $e) {
             $this->error($e->getMessage());