Merge branch 'feature/fin' into develop

This commit is contained in:
2025-11-01 11:32:16 +08:00
@@ -57,7 +57,7 @@ class FinStatisticsController extends BaseController
foreach ($unclaimed_payment_amount as $key => &$value) { foreach ($unclaimed_payment_amount as $key => &$value) {
$value['amount'] = $value['amount'] - $result['unclaimed_amount'][$key]['amount']; $value['amount'] = $value['amount'] - $result['unclaimed_amount'][$key]['amount'];
} }
$result['unclaimed_payment_amount'] = array_values($result['unclaimed_payment_amount']); $result['unclaimed_payment_amount'] = array_values($unclaimed_payment_amount);
$result['unclaimed_payment_amount_sum'] = $this->amountSum($result['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'] = $result['unclaimed_payment_amount_sum'] - $result['unclaimed_amount_sum'];