xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/fin' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-10-30 17:21:20 +08:00
parent 3d6aa5f365 a3819bcba7
commit ea0d5b14bc
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/FinPaymentApplyController.php
+7 -2
View File
@@ -47,7 +47,7 @@ class FinPaymentApplyController extends BaseController
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$OssService = new OssService();
if (isset($data['submit_files'])){
if (!empty($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true);
foreach ($data['submit_files'] as $key => $value) {
$data['submit_files'][$key] = [
@@ -56,6 +56,8 @@ class FinPaymentApplyController extends BaseController
'file_name' => $value['file_name'],
];
}
}else{
$data['submit_files'] = [];
}
if (!empty($data['voucher_file'])) {
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
@@ -106,7 +108,7 @@ class FinPaymentApplyController extends BaseController
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$OssService = new OssService();
if (isset($data['submit_files'])){
if (!empty($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true);
foreach ($data['submit_files'] as $key => $value) {
$data['submit_files'][$key] = [
@@ -115,7 +117,10 @@ class FinPaymentApplyController extends BaseController
'file_name' => $value['file_name'],
];
}
}else{
$data['submit_files'] = [];
}
if (!empty($data['voucher_file'])) {
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {