|
|
@@ -85,6 +85,14 @@ class ConsoleController extends BaseController
|
|
|
$kfWxIncome = bcadd($kfWxIncome1, $kfWxIncome2, 2);
|
|
|
$kfWxCount = bcadd($kfWxCount1, $kfWxCount2);
|
|
|
|
|
|
+ $cashIncome1 = $incomeList['cash']['category']['ls']['amount'] ?? 0;
|
|
|
+ $cashCount1 = $incomeList['cash']['category']['ls']['num'] ?? 0;
|
|
|
+ $cashIncome2 = $incomeList['cash']['category']['pf']['amount'] ?? 0;
|
|
|
+ $cashCount2 = $incomeList['cash']['category']['pf']['num'] ?? 0;
|
|
|
+
|
|
|
+ $cashIncome = bcadd($cashIncome1, $cashIncome2, 2);
|
|
|
+ $cashCount = bcadd($cashCount1, $cashCount2);
|
|
|
+
|
|
|
util::success([
|
|
|
'systemIncome' => $systemIncome,
|
|
|
'systemCount' => $systemCount,
|
|
|
@@ -92,6 +100,8 @@ class ConsoleController extends BaseController
|
|
|
'debtIncome' => $debtIncome,
|
|
|
'kfWxCount' => $kfWxCount,
|
|
|
'kfWxIncome' => $kfWxIncome,
|
|
|
+ 'cashCount' => $cashCount,
|
|
|
+ 'cashIncome' => $cashIncome,
|
|
|
]);
|
|
|
}
|
|
|
|