财务开票模块更新

server/app/Finance/Repositories/Eloquent/BaseRepository.php

@@ -30,4 +30,24 @@ abstract class BaseRepository extends BaseRepositoryEloquent
     {
         return DB::connection($this->getConnectionName());
     }
+
+    protected function pagePaginate($data, $total, $request)
+    {
+        $pageData = [];
+
+        $pageData['data'] = $data;
+        $pageData['total'] = $total;
+
+        $offset = $total;
+        if(isset($request['page_size']) && !empty($request['page_size'])){
+            $offset = $request['page_size'];
+        }
+        $pageData['total_page'] = ceil($total / $offset) - 1;
+        if($total == 0){
+            $pageData['total_page'] = 1;
+        }
+        $pageData['page_no'] = $request['page_no'];
+
+        return $pageData;
+    }
 }

server/app/Finance/Services/InvoiceService.php

@@ -842,13 +842,16 @@ class InvoiceService
            }
            $invocieTotal = $this->invoiceRecordRepository->count($where);
 
-           $dataReturn = [];
+           return $this->invoiceRecordRepository->pagePaginate($invoiceList,$invocieTotal,$requestParams);
+
+
+           /*$dataReturn = [];
            $dataReturn['data'] = $invoiceList;
            $dataReturn['total'] = $invocieTotal;
-           $dataReturn['total_page'] = ceil($invocieTotal / $offset) - 1;
-           $dataReturn['page_no'] = $pageNo;
+           $total = ceil($invocieTotal / $offset) - 1;
+           $dataReturn['total_page'] = ceil($invocieTotal / $offset) - 1 == 0 ? 1;
+           $dataReturn['page_no'] = $pageNo;*/
 
-           return $dataReturn;
        }catch(\Throwable $exception){
            SimpleLogs::writeLog($exception->getMessage(),__CLASS__.':'.__FUNCTION__,'error');
            throw $exception;