Merge branch 'feature/fin' into develop

app/common/service/FinPaymentApplyService.php

@@ -214,13 +214,18 @@ class FinPaymentApplyService
             $query->whereDoesntHave('receipt');
         }
 
+        if(isset($param['scene']) && $param['scene'] == 'pending'){ //待入账列表
+            $query->where('receipt_id', '>' ,'0');
+            $query->where('submit_files','!=','');
+        }
+
         if($param['scene'] == 'delete'){ //查询作废数据
             $query->onlyTrashed();
         }elseif ($param['scene'] == 'all'){ //查询包含作废数据的全量数据
             $query->withTrashed();
         }
 
-        if ((isset($param['scene']) && $param['scene'] == 'list') || empty($param['receipt_id'])) {
+        if ((isset($param['scene']) && ($param['scene'] == 'list' || $param['scene'] == 'pending'))|| empty($param['receipt_id']) ) {
             return $query->orderBy('id','desc')->paginate($limit, ['*'], 'page', $page);
         }
 

app/common/service/FinReceiptService.php

@@ -303,6 +303,11 @@ class FinReceiptService
     public function serviceUpdatePayment(Request $request, array $data = [], string $scene = 'payment')
     {
         $payment_apply_id = $request->input('payment_apply_id');
+        $exchange_rate = $request->input('exchange_rate');
+        if(empty($exchange_rate) || !is_numeric($exchange_rate)){
+            throw new BusinessException('请输入汇率');
+        }
+
         $id = $request->input('id');
         $data = $this->preProcess(ucfirst($scene), $data, $request);
         $config = $this->buildQueryConfig($request, $scene);
@@ -314,6 +319,8 @@ class FinReceiptService
         $receipt = FinReceipt::find($id);
         $data['discount_amount'] = $payment->amount - $receipt->amount ?? 0;
         $data['submit_files'] = $payment->submit_files ?? '';
+        $data['exchange_rate'] = $exchange_rate;
+        $data['total_amount_cny'] = round($data['amount']*$exchange_rate,2);
 
         $updated = $this->logicUpdateBy($config, $data);
         return $this->postProcess(ucfirst($scene), $data);