From d73728128366ecf4f9d747fd05a4615271874a03 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 30 Oct 2025 17:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=95=E5=A4=9A=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FinPaymentApplyController.php | 33 ++++++++++++++----- .../controller/FinReceiptController.php | 33 +++++++++++++++---- app/common/service/FinPaymentApplyService.php | 6 ++++ app/common/service/FinReceiptService.php | 6 +++- 4 files changed, 62 insertions(+), 16 deletions(-) diff --git a/app/common/controller/FinPaymentApplyController.php b/app/common/controller/FinPaymentApplyController.php index 1db09d3..0939646 100644 --- a/app/common/controller/FinPaymentApplyController.php +++ b/app/common/controller/FinPaymentApplyController.php @@ -59,11 +59,20 @@ class FinPaymentApplyController extends BaseController }else{ $data['submit_files'] = []; } - if (!empty($data['voucher_file'])) { - $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']); - } elseif (isset($data['voucher_file'])) { - $data['voucher_file_full'] = ''; + + if (!empty($data['voucher_file'])){ + $data['voucher_file'] = json_decode($data['voucher_file'], true); + foreach ($data['voucher_file'] as $key => $value) { + $data['voucher_file'][$key] = [ + 'file_src' => $value['file_src'], + 'file_full' => $OssService->generatePrivateUrl($value['file_src']), + 'file_name' => $value['file_name'], + ]; + } + }else{ + $data['voucher_file'] = []; } + if (isset($data['created_at'])) $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); if (isset($data['updated_at'])) @@ -121,11 +130,19 @@ class FinPaymentApplyController extends BaseController $data['submit_files'] = []; } - if (!empty($data['voucher_file'])) { - $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']); - } elseif (isset($data['voucher_file'])) { - $data['voucher_file_full'] = ''; + if (!empty($data['voucher_file'])){ + $data['voucher_file'] = json_decode($data['voucher_file'], true); + foreach ($data['voucher_file'] as $key => $value) { + $data['voucher_file'][$key] = [ + 'file_src' => $value['file_src'], + 'file_full' => $OssService->generatePrivateUrl($value['file_src']), + 'file_name' => $value['file_name'], + ]; + } + }else{ + $data['voucher_file'] = []; } + if (isset($data['created_at'])) $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); if (isset($data['updated_at'])) diff --git a/app/common/controller/FinReceiptController.php b/app/common/controller/FinReceiptController.php index 4e9c574..cade259 100644 --- a/app/common/controller/FinReceiptController.php +++ b/app/common/controller/FinReceiptController.php @@ -97,10 +97,19 @@ class FinReceiptController extends BaseController $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??''; if (isset($data['currency_id'])) //付款币种 $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??''; + + $OssService = new OssService(); if (!empty($data['fx_receipt_file'])){ - $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); - }elseif (isset($data['fx_receipt_file'])){ - $data['fx_receipt_file_full'] = ''; + $data['fx_receipt_file'] = json_decode($data['fx_receipt_file'], true); + foreach ($data['fx_receipt_file'] as $key => $value) { + $data['fx_receipt_file'][$key] = [ + 'file_src' => $value['file_src'], + 'file_full' => $OssService->generatePrivateUrl($value['file_src']), + 'file_name' => $value['file_name'], + ]; + } + }else{ + $data['fx_receipt_file'] = []; } return $data; } @@ -129,12 +138,22 @@ class FinReceiptController extends BaseController $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??''; if (isset($data['currency_id'])) //付款币种 $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??''; - if (!empty($data['fx_receipt_file'])) { - $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); - } elseif (isset($data['fx_receipt_file'])) { - $data['fx_receipt_file_full'] = ''; + + $OssService = new OssService(); + if (!empty($data['fx_receipt_file'])){ + $data['fx_receipt_file'] = json_decode($data['fx_receipt_file'], true); + foreach ($data['fx_receipt_file'] as $key => $value) { + $data['fx_receipt_file'][$key] = [ + 'file_src' => $value['file_src'], + 'file_full' => $OssService->generatePrivateUrl($value['file_src']), + 'file_name' => $value['file_name'], + ]; + } + }else{ + $data['fx_receipt_file'] = []; } + //查询关联的付款记录 if (!empty($data['payment_apply_id'])) { $paymentApply = FinPaymentApply::where('id', $data['payment_apply_id'])->first(); if(!$paymentApply) diff --git a/app/common/service/FinPaymentApplyService.php b/app/common/service/FinPaymentApplyService.php index 69fb4ce..0f6bec7 100644 --- a/app/common/service/FinPaymentApplyService.php +++ b/app/common/service/FinPaymentApplyService.php @@ -87,9 +87,12 @@ class FinPaymentApplyService { $data['apply_no'] = $this->generateUniqueApplyNo(); $data['doc_user_id'] = $request->user->uid; + $data['voucher_file'] = json_encode($data['voucher_file']); $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['voucher_file'] == '[]' || $data['voucher_file'] == '{}' ) + $data['voucher_file'] = ''; if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' ) $data['submit_files'] = ''; return $data; @@ -118,6 +121,9 @@ class FinPaymentApplyService $data['submit_files'] = json_encode($data['submit_files']); if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' ) $data['submit_files'] = ''; + $data['voucher_file'] = json_encode($data['voucher_file']); + if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' ) + $data['voucher_file'] = ''; return $data; } diff --git a/app/common/service/FinReceiptService.php b/app/common/service/FinReceiptService.php index be72fc9..f55ac9a 100644 --- a/app/common/service/FinReceiptService.php +++ b/app/common/service/FinReceiptService.php @@ -114,6 +114,8 @@ class FinReceiptService $data['arrived_at'] = strtotime( $data['arrived_at']); $data['created_by'] = $request->user->uid; $data['updated_by'] = $request->user->uid; + if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' ) + $data['fx_receipt_file'] = ''; return $data; } @@ -132,7 +134,9 @@ class FinReceiptService $data['arrived_at'] = strtotime($data['arrived_at']); if(isset($data['received_at'])) $data['received_at'] = strtotime($data['received_at']); - + + if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' ) + $data['fx_receipt_file'] = ''; return $data; } public function afterServiceUpdate($res)