Merge remote-tracking branch 'origin/master'

app/api/controller/Pub.php

@@ -263,7 +263,7 @@ class Pub extends BaseController
         foreach ($data['list'] as &$item) {
             $infoAuditDb = new InfoAudit();
             $infoData = $infoAuditDb->getItem(["status"=>1,"uid"=>$item["uid"]]);
-            $item['is_type_audit'] = !empty($infoData['is_type_audit']) ? $infoData['is_type_audit'] : '';
+            $item['is_type_audit'] = $item['is_type_audit']==1?1:0;
             $item['ancestral_place'] = !empty($infoData['ancestral_place']) ? $infoData['ancestral_place'] : '';
         }
         return app('json')->success($data);

app/api/controller/User.php

@@ -30,6 +30,7 @@ use app\model\api\ShowTemplateOrder;
 use app\model\api\UserShowTemplate;
 use app\model\api\UserWorkType;
 use app\model\api\PayTrade as PayTradeModel;
+use app\api\controller\pub;
 
 use app\Request;
 use library\services\UtilService;
@@ -109,12 +110,67 @@ 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"];
+
+        $post["parent_uid"] = $request->user["uid"];
+
+        $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);
     }
+    
+    
+     /**
+     * 获取用户总邀请人数排行榜
+     * @param Request $request
+     */
+     public function getInviterRanking(Request $request){
+         $time = $request->param('time', time());
+         $times = explode(" - ",$time);
+         $page = $request->param('page', 1); // 获取请求中的页码参数，默认为 1
+         $pageSize = $request->param('pageSize', 6); // 获取请求中的每页记录数参数，默认为 6
+         if(sizeof($times)==2)
+         {
+             $count = (new UserModel) -> where('parent_uid', $request->user['uid'])->where('regtime','>=',$times[0])->where('regtime','<',$times[1])->count();
+         }
+         else
+         {
+             $count = (new UserModel) -> where('parent_uid', $request->user['uid'])->count();
+         }
+         $uids = (new UserModel) -> where('parent_uid', $request->user['uid'])
+                                 -> column('uid');
+         $InfoAudit= new InfoAudit();
+          $list = [];
+          if($count) 
+          {
+              $list = (new UserModel)  -> where('parent_uid', 'in',$uids)
+                                  -> group('parent_uid')
+                                  -> field('parent_uid, COUNT(*) AS count')
+                                  -> order('count', 'DESC')
+                                  -> page($page,$pageSize)
+                                  -> select()
+                                  -> toArray();
+                                  
+              foreach ($list as &$v)
+              {
+                  $v['auth_info'] = $InfoAudit->where('uid',$v['uid'])->where('status',1)->find();
+              }
+          }
+        return app('json')->success(compact('count','list'));
+     }
+    
+    
+    
 
 
     /**

app/api/route/user.php

@@ -25,8 +25,13 @@ Route::group('user', function () {
     Route::rule('subTypeAudit', 'User/subTypeAudit');
     //获取用户子级列表
     Route::rule('getChildList', 'User/getChildList');
+<<<<<<< HEAD
+    //获取用户总邀请人数排行榜
+    Route::rule('getInviterRanking','User/getInviterRanking');
+=======
     //获取邀请人数排行榜
     Route::rule('getInviterRanking','User/getInviterRanking');
+>>>>>>> b1c250f8cc2d64dfdf9f96dd213493c005116a46
     //提交模板订单
     Route::rule('subShowTemplateOrder', 'User/subShowTemplateOrder');
     //模板支付订单状态查询

app/model/api/User.php

@@ -269,7 +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")