收入

app-ghs/controllers/ConsoleController.php

@@ -63,6 +63,9 @@ class ConsoleController extends BaseController
         $systemIncome = $incomeList['system']['amount'] ?? 0;
         $systemCount = $incomeList['system']['num'] ?? 0;
 
+        $systemIncome2 = $incomeList['system']['category']['pf']['amount'] ?? 0;
+        $systemCount2 = $incomeList['system']['category']['pf']['num'] ?? 0;
+
         $debtIncome = $incomeList['debt']['amount'] ?? 0;
         $debtCount = $incomeList['debt']['num'] ?? 0;
 
@@ -72,6 +75,8 @@ class ConsoleController extends BaseController
         util::success([
             'systemIncome' => $systemIncome,
             'systemCount' => $systemCount,
+            'systemIncome2' => $systemIncome2,
+            'systemCount2' => $systemCount2,
             'debtCount' => $debtCount,
             'debtIncome' => $debtIncome,
             'kfWxCount' => $kfWxCount,

biz-ghs/stat/classes/StatKdClass.php

@@ -62,7 +62,7 @@ class StatKdClass extends BaseClass
             'system' => [
                 'amount' => 0,
                 'num' => 0,
-                'name' => '系统收入',
+                'name' => '系统总收入',
                 'category' => [
                     'pf' => ['name' => '批发', 'key' => 'pf', 'num' => 0, 'amount' => 0],
                     'ls' => ['name' => '零售', 'key' => 'ls', 'num' => 0, 'amount' => 0],