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-11-01 13:20:38 +08:00
parent 6493bdebb1 74ac8941ea
commit 596313ed5a
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/dashboard/FinStatisticsController.php
+21 -4
View File
@@ -37,7 +37,17 @@ class FinStatisticsController extends BaseController
$result['unreceived_amount'] = array_values($this->receiptStatisticsSum($query2, $currency)); //各币种的未入账金额
$result['unreceived_amount_sum'] = $this->amountSum($result['unreceived_amount']); //未入账的已认领的人民币总金额
$query3 = FinReceipt::whereNull('payment_apply_id');
//今日入账
$query6 = FinReceipt::where('received_at','>',strtotime(date("Y-m-d")));
//今日入账数量
$result['received_num'] = $query6->count();
//未入账金额
// $result['unreceived_amount'] = $query2->sum('amount');
$result['received_amount'] = array_values($this->receiptStatisticsSum($query6, $currency)); //各币种的未入账金额
$result['received_amount_sum'] = $this->amountSum($result['unreceived_amount']); //未入账的已认领的人民币总金额
$query3 = FinReceipt::where('payment_apply_id',0);
//未认领数量
$result['unclaimed_num'] = $query3->count();
@@ -57,13 +67,20 @@ class FinStatisticsController extends BaseController
foreach ($unclaimed_payment_amount as $key => &$value) {
$value['amount'] = $value['amount'] - $result['unclaimed_amount'][$key]['amount'];
}
$result['unclaimed_payment_num'] = $query5->count();
$result['unclaimed_payment_amount'] = array_values($unclaimed_payment_amount);
$result['unclaimed_payment_amount_sum'] = $this->amountSum($result['unclaimed_payment_amount']);
//在途资金 = 没有认领的付款资金-未认领的收款资金
$result['intransit_amount'] = $result['unclaimed_payment_amount_sum'] - $result['unclaimed_amount_sum'];
$result['intransit_amount_sum'] = $result['unclaimed_payment_amount_sum'] - $result['unclaimed_amount_sum'];
$intransit_amount_amount = [];
//在途资金各币种明细
foreach ($unclaimed_payment_amount as $key => $value) {
$value['amount'] = $value['amount'] - $result['unclaimed_amount'][$key]['amount'];
$intransit_amount_amount[] = $value;
}
$result['intransit_amount_amount'] = $intransit_amount_amount;
//在途数量 = 没有认领的付款数量-未认领的收款数量
$result['intransit_count'] = count($result['unclaimed_payment_amount']) - count($result['unclaimed_amount']);
$result['intransit_count'] = $result['unclaimed_payment_num'] - $result['unclaimed_num'];
//未认领金额重新组织索引
$result['unclaimed_amount'] = array_values($result['unclaimed_amount']);