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:54:43 +08:00
parent 695c398962 d737281283
commit 9f167ad526
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/FinPaymentApplyController.php
+23 -6
View File
@@ -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'] = '';
$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']))
@@ -122,10 +131,18 @@ class FinPaymentApplyController extends BaseController
}
if (!empty($data['voucher_file'])){
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {
$data['voucher_file_full'] = '';
$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']))
app/common/controller/FinReceiptController.php
+25 -6
View File
@@ -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')??'';
$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'] = [];
}
//查询关联的付款记录
if (!empty($data['payment_apply_id'])) {
$paymentApply = FinPaymentApply::where('id', $data['payment_apply_id'])->first();
if(!$paymentApply)
app/common/service/FinPaymentApplyService.php
+6
View File
@@ -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;
}
app/common/service/FinReceiptService.php
+4
View File
@@ -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;
}
@@ -133,6 +135,8 @@ class FinReceiptService
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)