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

收款附件优化

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-09-28 09:56:01 +08:00
parent 40dfd99f4e
commit a3a6cfefc0
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/FinPaymentApplyController.php
+8 -4
View File
@@ -55,9 +55,11 @@ class FinPaymentApplyController extends BaseController
]; ];
} }
} }
$data['voucher_file_full'] = ''; if (!empty($data['voucher_file'])) {
if (!empty($data['voucher_file']))
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']); $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {
$data['voucher_file_full'] = '';
}
if (isset($data['created_at'])) if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at'])) if (isset($data['updated_at']))
@@ -96,9 +98,11 @@ class FinPaymentApplyController extends BaseController
]; ];
} }
} }
$data['voucher_file_full'] = ''; if (!empty($data['voucher_file'])) {
if (!empty($data['voucher_file']))
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']); $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {
$data['voucher_file_full'] = '';
}
if (isset($data['created_at'])) if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at'])) if (isset($data['updated_at']))
app/common/controller/FinReceiptController.php
+8 -3
View File
@@ -42,9 +42,11 @@ class FinReceiptController extends BaseController
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??''; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??''; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$data['fx_receipt_file_full'] = ''; if (!empty($data['fx_receipt_file'])){
if (!empty($data['fx_receipt_file']))
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($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'] = '';
}
return $data; return $data;
} }
@@ -70,8 +72,11 @@ class FinReceiptController extends BaseController
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??''; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??''; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (isset($data['fx_receipt_file'])) if (!empty($data['fx_receipt_file'])) {
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($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'] = '';
}
return $data; return $data;
} }
} }