超时未上传入账资料筛选

app/common/service/FinPaymentApplyService.php

@@ -58,6 +58,11 @@ class FinPaymentApplyService
                     $config['where']['account_id'] = $p['account_id'];
                 }
 
+                // 入账资料超时
+                if (isset($p['scene']) && $p['scene'] == 'file_timeout') {
+                    $config['where']['claimed_at'] = ['between', [1, time()-24*60*60]];
+                }
+
                 // 关键字
                 if (isset($p['keyword']) && $p['keyword']) {
                     $k = '%' . $p['keyword'] . '%';
@@ -156,7 +161,8 @@ class FinPaymentApplyService
         $param = $request->all();
 
         $where = [];
-        
+        $orWhere = [];
+
         // 汇款国家
         if (isset($param['country_id']) && !empty($param['country_id'])) {
             $where[] = ['country_id', $param['country_id']];
@@ -166,6 +172,14 @@ class FinPaymentApplyService
             $where[] = ['account_id', $param['account_id']];
         }
 
+        // 入账资料超时
+        if (isset($param['scene']) && $param['scene'] == 'file_timeout') {
+            $where[] = ['claimed_at', '<', time()-24*60*60];
+            $where[] = ['claimed_at', '>', 1];
+            $orWhere[] = ['submit_files', '[]'];
+            $orWhere[] = ['submit_files', ''];
+        }
+
         // 关键字
         if (isset($param['keyword']) && $param['keyword']) {
             $k = '%' . $param['keyword'] . '%';
@@ -173,7 +187,9 @@ class FinPaymentApplyService
         }
 
         // 构建查询
-        $query = $this->modelClass::where($where);
+        $query = $this->modelClass::where($where)->where(function($query) use ($orWhere) {
+            $query->orWhere($orWhere);
+        });
 
         // 是否已关联收款记录的筛选
         $correlation = $param['correlation']??'';