会员粉丝调整

app/admin/service/member/MemberService.php

@@ -760,13 +760,13 @@ class MemberService
         $page = $request->get('page', 1);
         $pageSize = $request->get('pageSize', 20);
         $memberId = $request->get('member_id');
-        $accounts = MemberAccount::where('join_account_member_id', $memberId)->where('member_account_classify','CARD');
+        $accounts = MemberAccount::where('join_account_member_id', $memberId)->where('member_account_classify', 'CARD');
         $total = $accounts->count();
         $rows = $accounts->orderByDesc('member_account_addtimes')
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
-        foreach ($rows as &$row){
+        foreach ($rows as &$row) {
             $row['member_account_surplus'] += $row['member_account_added'];
         }
 
@@ -1014,6 +1014,8 @@ class MemberService
      */
     public static function fansList(Request $request)
     {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 1000);
         $memberId = $request->get('member_id');
         $name = $request->get('name', '');
         $mobile = $request->get('mobile', '');
@@ -1095,8 +1097,13 @@ class MemberService
             unset($fan['info'], $fan['cert'], $fan['role']);
         }
 
-        $tree = new Tree($fans);
-        return json_success('success', $tree->getTree());
+        $tree = (new Tree($fans))->getTree();
+        $total = count($tree);
+
+        $start = ($page - 1) * $pageSize;
+        $rows = array_splice($tree, $start, $pageSize);
+
+        return json_success('success', compact('rows','total','page','pageSize'));
     }