Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/api/controller/Family.php

@@ -14,6 +14,7 @@ use app\lib\model\FamilyModel;
 use app\lib\model\FamilyPeopleModel;
 use app\lib\model\FamilyTreeMateModel;
 use app\lib\model\FamilyTreeModel;
+use app\lib\model\NameCardModel;
 use app\lib\model\SurnameModel;
 use app\lib\service\AddressService;
 use function PHPSTORM_META\elementType;
@@ -46,6 +47,10 @@ class Family extends Api
 
         $people_id=$this->request->param("people_id");//选择自己id
 
+
+        $type=$this->request->param("type",2);//认领方式（2名片认领，3线上认领）
+        $activation_code=$this->request->param("activation_code");
+
         if(!empty($people_id)){
             $people=FamilyPeopleModel::dataInfo(['id'=>$people_id]);
             if(empty($people)){
@@ -53,11 +58,32 @@ class Family extends Api
             }else if($people && $people['user_id']){
                 $this->error("该成员已被账户关联");
             }
+            if($people['is_pay']==0){
+                $this->success("请激活！",$people);
+            }
             $res=FamilyPeopleModel::dataUpdate(['id'=>$people_id],['user_id'=>$this->auth->id,'fastim_id' =>$fastim_id]);
+            if($type==2){NameCardModel::dataUpdate(['activation_code'=>$activation_code,'user_id'=>0],['user_id'=>$this->auth->id]);}
             $this->success("该用户认领成功",$res);
         }else{
             $data=FamilyTreeModel::claimFamilyPeople(['ft1.name'=>$name,'ft2.name'=>$parent_name,'ft3.name'=>$grandpa_name]);
-            $this->success("",$data);
+            $list=[];
+            if($type==2){
+               $family_id= NameCardModel::where(['activation_code'=>$activation_code,'user_id'=>0])->value("family_id");
+               foreach ($data as $key=>$val){
+                   if ($val['family_id'] == $family_id){
+                       array_push($list,$val);
+                   }
+               }
+            }else{
+                foreach ($data as $key=>$val){
+                    $people=FamilyPeopleModel::dataInfo(['id'=>$val['people_id'],'activation_code'=>$activation_code]);
+                    if ($people){
+                        array_push($list,$val);
+                    }
+                }
+            }
+
+            $this->success("",$list);
         }
     }
 

application/api/controller/FamilyTree.php

@@ -701,6 +701,20 @@ class FamilyTree extends Api
         $this->success("审核成功");
     }
 
+    /**
+     * 我创建的族员
+     */
+    public function myCreateFamilyPeople(){
+        $page=$this->request->param("page",1);
+        $skeyword=$this->request->param("skeyword");
+        $where= " (ft.create_user_id = ".$this->auth->id. " OR ftm.create_user_id = ".$this->auth->id . ") ";
+        if(!empty($skeyword)){
+            $where = $where . " AND  fp.name like '%".$skeyword."'";
+        }
+        $list=FamilyPeopleModel::myCreateFamilyPeople($where,$page,$this->pageSize);
+
+        $this->success("",$list);
+    }
 
 
 

application/lib/model/FamilyPeopleModel.php

@@ -83,5 +83,21 @@ class FamilyPeopleModel extends Model
         return self::where($where)->update($data);
     }
 
+    /**
+     * 查询我创建的族员
+     */
+    public static function myCreateFamilyPeople($where,$page,$pageSize=10){
+        $data=self::alias("fp")
+            ->join("family_tree ft","ft.people_id=fp.id","LEFT")
+            ->join("family_tree_mate ftm","ftm.people_id=fp.id","LEFT")
+            ->field("fp.id,fp.name,fp.photo,fp.sex,fp.activation_code")
+            ->where($where)
+            ->page($page)
+            ->limit($pageSize)
+            ->order("fp.id DESC")
+            ->select();
+        return $data;
+    }
+
 
 }
\ No newline at end of file

application/lib/model/NameCardModel.php

+<?php
+
+
+namespace app\lib\model;
+
+
+use think\Model;
+
+class NameCardModel extends Model
+{
+
+    // 表名
+    protected $name = 'name_card';
+
+
+    /**
+     * @功能说明:
+     */
+    public static function dataInfo($where){
+
+        return  self::where($where)->find();
+    }
+
+
+    /**
+     * @功能说明:编辑
+     */
+    public static function dataUpdate($where,$data){
+
+        return self::where($where)->update($data);
+    }
+}
\ No newline at end of file

application/lib/service/FamilyTreeService.php

@@ -56,7 +56,7 @@ class FamilyTreeService
         }else{
             $family_id = isset($param['family_id'])?$param['family_id']:$family_id;
             if(!empty($family_id)) FamilyModel::where(['id'=>$family_id])->setInc('join_number');
-            $people["activation_code"]=create_randomstr();
+            $people["activation_code"]=$people['ext0'] == 0?create_randomstr():null;
             return FamilyPeopleModel::dataAdd($people);
         }
     }