家族，微调

application/api/controller/Family.php

@@ -189,6 +189,20 @@ class Family extends Api
                     throw new Exception('您已创建过家族！');
                 }
 
+                //检查不能是其他家族的成员
+                $checkmember = model('FamilyMember')->where('user_id',$this->auth->id)->find();
+                if (!empty($checkmember)) {
+                    $this->error('您已经加入了其他家族');
+                }
+
+                //检查删除这个人的所有加入申请
+                $joinWhere['user_id'] = $this->auth->id;
+                $joinWhere['status'] = 0;
+                $joinData = model('FamilyJoinin')->where($joinWhere)->find();
+                if (!empty($checkmember)) {
+                    $this->error('您已经申请加入了其他家族,需等待被拒或退出,才能创建家族');
+                }
+
                 //准备创建
                 $guildInfo = new \app\common\model\Family();
                 $guildInfo->user_id = $user_id;
@@ -254,9 +268,8 @@ class Family extends Api
      * 公会签约申请
      */
     public function guildJoinin() {
-        $join_time = input("join_time",1); //签约时长:1=3个月,2=6个月,3=12个月
+
         $guild_id = input("guild_id"); //公会ID
-        //if(!in_array($join_time,[1,2,3]) || !$guild_id) $this->error("参数错误！");
 
         // 一个身份证号只能申请一次
         $user_id = $this->auth->id;
@@ -291,7 +304,6 @@ class Family extends Api
         $data = [];
         $data["user_id"] = $user_id;
         $data["guild_id"] = $guild_id;
-        $data["join_time"] = $join_time;
         $data["user_avatar"] = $userInfo->avatar;
         $data["user_idcard"] = $authUserIdcard;
         $data["user_nickname"] = $userInfo->nickname;
@@ -344,11 +356,6 @@ class Family extends Api
         // 获取用户信息
         $userInfo = \app\common\model\User::field("id,u_id,mobile,nickname")->where(["id"=>$joininInfo->user_id])->find();
 
-        // 计算签约时间段
-        $join_time = $joininInfo->join_time;
-        $timeArr = [1=>3,2=>6,3=>12];
-        $endtime = strtotime('+'.$timeArr[$join_time].' month');
-        $sign_time_slot = date("Y.m.d")."-".date('Y.m.d',$endtime);
         Db::startTrans();
         try{
             //记个无用的日志
@@ -360,7 +367,6 @@ class Family extends Api
             $data["guild_id"] = $guildInfo->id;
             $data["guild_name"] = $guildInfo->name;
             $data["guild_g_id"] = $guildInfo->g_id;
-            $data["sign_time_slot"] = $sign_time_slot;
             $data["status"] = $is_pass;
             $data["createtime"] = time();
             $res1 = \app\common\model\FamilyJoininLog::insert($data);