Merge branch 'master' of http://git.liuniu946.com/yingzi/infantServiceApi

app/api/controller/Pub.php

@@ -102,6 +102,46 @@ class Pub extends BaseController
         }
         return app('json')->success($data);
     }
+    /**
+     * 获取邀请人数排行榜
+     * @param Request $request
+     */
+    public function getInviteRankList(Request $request){
+        $post = UtilService::getMore([
+            ['page', 1],
+            ['pageSize', 50],
+        ], $request);
+        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
+        $post["page"]     = $post["page"] <= 0 ? 1 : (int)$post["page"];
+        $where = [];
+        $where[] = ["u.total_invites", ">", 0];
+        $totalCount = $this->alias("u")->where($where)->count();
+        $data = null;
+        if($totalCount > 0){
+            $data = $this
+                ->alias("u")
+                ->field("u.uid, u.nickname, u.avatar, u.total_invites, u.is_type_audit, u.ancestral_place") // 添加 is_type_audit 和 ancestral_place 字段
+                ->where($where)
+                ->order("u.total_invites", "desc") // 按照邀请人数倒序排列
+                ->page($post["page"], $post["pageSize"])
+                ->select();
+            if(!empty($data)){
+                $data = $data->toArray();
+            }
+            $infoAuditDb = new InfoAudit();
+            foreach($data as $k=>$v){
+                $item = $this->getShowTemplateItem($v["uid"]); // 获取用户模板详情
+                $infoData = $infoAuditDb->getItem(["status"=>1,"uid"=>$v["uid"]]);
+                if(!empty($infoData)){
+                    $item["is_type_audit"] = $infoData["is_type_audit"];
+                    $item["ancestral_place"] = $infoData["ancestral_place"];
+                }
+                $data[$k] = array_merge($v, $item);
+            }
+        }
+        $data = empty($data) ? [] : $data;
+        return ["list" => $data, "pageSize" => $post["pageSize"], "page" => $post["page"], "totalCount" => $totalCount];
+    }
     
     /**
      * 获取皮肤模板列表

app/api/controller/User.php

@@ -110,6 +110,7 @@ class User extends BaseController
             ['page', 1],
             ['pageSize', 50],
         ], $request);
+<<<<<<< HEAD
 
         $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
         $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
@@ -119,6 +120,12 @@ class User extends BaseController
         $data = (new UserModel)->getDataList($post, "u.uid,u.mobile,u.nickname,u.avatar");
 
 
+=======
+        $post["pageSize"]  = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
+        $post["page"]      = $post["page"]<=0     ? 1  : (int)$post["page"];
+        $post["parent_uid"]= $request->user["uid"];
+        $data = (new UserModel)->getDataList($post,"u.uid,u.mobile,u.nickname,u.avatar");
+>>>>>>> 7e9deec4b69946e56f2d67e274125611f70c3461
         return app('json')->success($data);
     }
     
@@ -165,6 +172,7 @@ class User extends BaseController
     
     
 
+
     /**
      * 设置用户信息
      * @param Request $request

app/model/api/User.php

@@ -269,8 +269,12 @@ class User extends BaseModel
         if($totalCount>0){
             $data = $this
                 ->alias("u")
+<<<<<<< HEAD
                 ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit")
                 ->leftJoin("info_audit a","u.uid=a.uid")
+=======
+                ->field("u.uid,ut.show_template_id")
+>>>>>>> 7e9deec4b69946e56f2d67e274125611f70c3461
                 ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")//默认模板
                 ->where($where)
                 ->order("u.show_temp_seq", "desc")