完善功能

app/admin/controller/member/BenefitController.php

@@ -237,6 +237,8 @@ class BenefitController extends Curd
 
     public function writeOffList(Request $request)
     {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
         $memberId = $request->get('member_id', '');
         $benefitId = $request->get('benefit_id', '');
 
@@ -255,11 +257,15 @@ class BenefitController extends Curd
             }
         ])->where('join_appointment_member_id', $memberId)
             ->where('join_appointment_member_benefit_id', $benefitId)
-            ->where('appointment_status', 'DONE')
-            ->orderBy('appointment_done_datetime','DESC')
-            ->get();
-
-        foreach ($quotas as &$quota) {
+            ->where('appointment_status', 'DONE');
+            $total = $quotas->count('*');
+        
+            $rows = $quotas->orderBy('appointment_done_datetime','DESC')
+                ->forPage($page, $pageSize)
+                ->get()
+                ->toArray();
+
+        foreach ($rows as &$quota) {
             $quota['premises'] = '';
             $quota['username'] = '';
             if (!empty($quota['appointment_done_json'])) {
@@ -277,7 +283,8 @@ class BenefitController extends Curd
             }
         }
 
-        return json_success('', $quotas);
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+        // return json_success('', $quotas);
     }
 
     public function service(Request $request)

app/admin/controller/member/MemberController.php

@@ -257,7 +257,7 @@ class MemberController
             return json_fail("参数错误");
         }
 
-        return MemberService::balanceInfo($memberId);
+        return MemberService::balanceInfo($request);
     }
 
     public function pointInfo(Request $request)

app/admin/controller/member/QuotaController.php

@@ -196,6 +196,8 @@ class QuotaController extends Curd
 
     public function writeOffList(Request $request)
     {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
         $memberId = $request->get('member_id', '');
         $componentId = $request->get('component_id', '');
 
@@ -211,12 +213,14 @@ class QuotaController extends Curd
             }
         ])->where('join_quota_member_id', $memberId)
             ->where('join_member_rule_added_component_id', $componentId)
-            ->where('member_quota_status', 'USED')
-            ->orderBy('member_quota_used_json->charge->charge_write_off_time', 'desc')
+            ->where('member_quota_status', 'USED');
+        $total = $quotas->count('*');
+        $rows = $quotas->orderBy('member_quota_used_json->charge->charge_write_off_time', 'desc')
+            ->forPage($page, $pageSize)
             ->get()
             ->toArray();
 
-        foreach ($quotas as &$quota) {
+        foreach ($rows as &$quota) {
             $quota['premises'] = '';
             $quota['username'] = '';
             if (!empty($quota['member_quota_used_json'])) {
@@ -234,7 +238,8 @@ class QuotaController extends Curd
             }
         }
 
-        return json_success('', $quotas);
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+        // return json_success('', $quotas);
     }
 
     /**

app/admin/service/member/MemberService.php

@@ -127,8 +127,12 @@ class MemberService
         return json_success('', $member);
     }
 
-    public static function balanceInfo($memberId)
+    public static function balanceInfo(Request $request)
     {
+        $memberId = $request->get('member_id', '');
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
+
         $account = MemberAccount::where('join_account_member_id', $memberId)
             ->where('member_account_classify', 'CASH')
             ->first();
@@ -225,7 +229,11 @@ class MemberService
             $data[] = $item;
         }
 
-        return json_success('', $data);
+        $total = count($data);
+        $start = ($page-1)*$pageSize;
+        $rows = array_slice($data,$start,$pageSize);
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
     }
 
     public static function pointInfo($memberId)

app/admin/service/sys_manage/UserService.php

@@ -24,11 +24,14 @@ class UserService
         $page = $request->get('page', 1);
         $pageSize = $request->get('pageSize', 10);
         $username = $request->get('username', '');
+        $loginName = $request->get('login_name', '');
 
         $rows = SysUser::with('role')
             ->select('join_user_role_id', 'join_user_dept_id', 'user_id', 'user_status', 'user_category', 'user_name', 'user_login_name', 'user_mobile', 'user_remark', 'user_extend_json', 'user_addtimes')
             ->when($username != '', function ($query) use ($username) {
                 $query->where('user_name', 'like', '%' . $username . '%');
+            })->when($loginName != '', function ($query) use ($loginName) {
+                $query->where('user_login_name', 'like', '%' . $loginName . '%');
             })
             ->orderBy('user_addtimes', 'DESC')
             ->forPage($page, $pageSize)