每刻

app/Service/MayCurServerService.php

@@ -195,7 +195,7 @@ class MayCurServerService extends Service
         if(isset($result['code']) && $result['code'] != 'ACK') return [false, $result['message']];
 
         //组织返回数据
-        if(empty($result['data'])) return [true, $result['data']];
+        if(empty($result['data'])) return [true, ['list' => [], 'hasNextPage' => false]];
 
         //获取报销单详情填充
         list($status, $return) = $this->loanDetailGet($result['data']);
@@ -205,17 +205,17 @@ class MayCurServerService extends Service
     }
 
     public function loanRule($data){
-        if(empty($data['createdAtStart']) || empty($data['createdAtEnd'])) return [false, '单据的创建时间不能为空'];
-        $createAtStart = strtotime($data['createdAtStart'] . '00:00:00');
-        $createdAtEnd = strtotime($data['createdAtEnd'] . '23:59:59');
-        if(empty($createAtStart)) return [false, '单据的创建开始时间格式错误'];
-        if(empty($createdAtEnd)) return [false, '单据的创建结束时间格式错误'];
+        if(empty($data['settledAtStart']) || empty($data['settledAtEnd'])) return [false, '单据的创建时间不能为空'];
+        $settledAtStart = strtotime($data['settledAtStart'] . '00:00:00');
+        $settledAtEnd = strtotime($data['settledAtEnd'] . '23:59:59');
+        if(empty($settledAtStart)) return [false, '单据的创建开始时间格式错误'];
+        if(empty($settledAtEnd)) return [false, '单据的创建结束时间格式错误'];
 
         $pageNo = 1;
         $pageSize = 10;
         if(! empty($data['pageNo'])) $pageNo = $data['pageNo'];
         if(! empty($data['pageSize'])) {
-            if($data['pageSize'] >= 100) {
+            if($data['pageSize'] >= 10) {
                 $pageSize = 10;
             }else{
                 $pageSize = $data['pageSize'];
@@ -223,10 +223,14 @@ class MayCurServerService extends Service
         }
 
         $return = [
-            'createdAtStart' => $createAtStart * 1000,
-            'createdAtEnd' => $createdAtEnd * 1000,
+            'settledAtStart' => $settledAtStart * 1000,
+            'settledAtEnd' => $settledAtEnd * 1000,
             'pageNo' => $pageNo,
             'pageSize' => $pageSize,
+            'formStatus' => 'COMPLETED',
+            "legalEntityBizCodes" => [
+                "ELC2106251C5CMNI8"
+            ],
         ];
 
         return [true, $return];
@@ -235,14 +239,15 @@ class MayCurServerService extends Service
     public function loanDetailGet($list){
         if(empty($list['list'])) return [true, $list];
 
-        foreach ($list['list'] as $key => $value){
+        $return = [];
+        foreach ($list['list'] as $value){
             list($status, $msg) = $this->loanDetail($value);
             if(! $status) return [false, $msg];
 
-            $list['list'][$key]['loanDetail'] = $msg;
+            $return[] = $msg;
         }
 
-        return [true, $list];
+        return [true, ['list' => $return, 'hasNextPage' => $list['hasNextPage']]];
     }
 
     public function loanDetail($data){