Merge branch 'feature/fin' into develop

app/common/service/FinPaymentApplyService.php

@@ -217,6 +217,7 @@ class FinPaymentApplyService
         if(isset($param['scene']) && $param['scene'] == 'pending'){ //待入账列表
             $query->where('receipt_id', '>' ,'0');
             $query->where('submit_files','!=','');
+            $query->whereNotNull('received_at');
         }
 
         if($param['scene'] == 'delete'){ //查询作废数据

app/common/service/FinReceiptService.php

@@ -10,6 +10,7 @@ use app\common\validate\FinReceiptValidate;
 use app\common\traits\crud\CrudServiceTrait;
 use app\common\model\FinReceipt;
 use support\exception\BusinessException;
+use support\Redis;
 use support\Request;
 
 class FinReceiptService
@@ -194,6 +195,10 @@ class FinReceiptService
         $page  = (int)$request->get('current',  1);
         $param = $request->all();
 
+        if(isset($param['voucher_no_timeout_hour'])){
+            redis::set('voucher_no_timeout_hour', $param['voucher_no_timeout_hour'], 'EX', 30);
+        }
+
         $where = [];
 
         // 汇款国家
@@ -295,6 +300,7 @@ class FinReceiptService
             'total_amount_cny' => round($finReceipt['amount']*$exchange_rate,2),
         ];
         $res = $this->logic->credit($id,$data);
+        FinPaymentApply::where('id', $finReceipt->payment_apply_id)->update(['received_at' => $data['received_at']]);
         $this->afterServiceUpdate(['id'=>$id]);
         return $res;
     }