Merge branch 'feature/fin' into develop

app/common/service/FinPaymentApplyService.php

@@ -90,6 +90,8 @@ class FinPaymentApplyService
         $data['submit_files'] = json_encode($data['submit_files']);
         redis::set('stock_' . $data['doc_user_id'], json_encode($request->post('stock')), 'EX', 30);
         unset($data['stock']);
+        if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
+            $data['submit_files'] = '';
         return $data;
     }
 
@@ -113,6 +115,8 @@ class FinPaymentApplyService
     public function beforeServiceUpdate($data, Request $request)
     {
         $data['submit_files'] = json_encode($data['submit_files']);
+        if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
+            $data['submit_files'] = '';
         return $data;
     }
 
@@ -174,10 +178,9 @@ class FinPaymentApplyService
 
         // 入账资料超时
         if (isset($param['scene']) && $param['scene'] == 'file_timeout') {
+            $where[] = ['submit_files', ''];
             $where[] = ['claimed_at', '<', time()-24*60*60];
             $where[] = ['claimed_at', '>', 1];
-            $orWhere[] = ['submit_files', '[]'];
-            $orWhere[] = ['submit_files', ''];
         }
 
         // 关键字
@@ -187,9 +190,7 @@ class FinPaymentApplyService
         }
 
         // 构建查询
-        $query = $this->modelClass::where($where)->where(function($query) use ($orWhere) {
-            $query->orWhere($orWhere);
-        });
+        $query = $this->modelClass::where($where);
 
         // 是否已关联收款记录的筛选
         $correlation = $param['correlation']??'';