进账

app-ghs/controllers/ConsoleController.php

@@ -60,23 +60,34 @@ class ConsoleController extends BaseController
     public function actionStrokeCount()
     {
         $incomeList = StatKdClass::eachChannelIncome($this->mainId, $this->shop);
-        $systemIncome = $incomeList['system']['amount'] ?? 0;
-        $systemCount = $incomeList['system']['num'] ?? 0;
 
+        $systemIncome1 = $incomeList['system']['category']['ls']['amount'] ?? 0;
+        $systemCount1 = $incomeList['system']['category']['ls']['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;
+        $systemIncome = bcadd($systemCount1, $systemCount2);
+        $systemCount = bcadd($systemIncome1, $systemIncome2, 2);
 
-        $kfWxIncome = $incomeList['kfWx']['amount'] ?? 0;
-        $kfWxCount = $incomeList['kfWx']['num'] ?? 0;
+        $debtIncome1 = $incomeList['debt']['category']['ls']['amount'] ?? 0;
+        $debtCount1 = $incomeList['debt']['category']['ls']['num'] ?? 0;
+        $debtIncome2 = $incomeList['debt']['category']['pf']['amount'] ?? 0;
+        $debtCount2 = $incomeList['debt']['category']['pf']['num'] ?? 0;
+
+        $debtIncome = bcadd($debtIncome1, $debtIncome2, 2);
+        $debtCount = bcadd($debtCount1, $debtCount2);
+
+        $kfWxIncome1 = $incomeList['kfWx']['category']['ls']['amount'] ?? 0;
+        $kfWxCount1 = $incomeList['kfWx']['category']['ls']['num'] ?? 0;
+        $kfWxIncome2 = $incomeList['kfWx']['category']['pf']['amount'] ?? 0;
+        $kfWxCount2 = $incomeList['kfWx']['category']['pf']['num'] ?? 0;
+
+        $kfWxIncome = bcadd($kfWxIncome1, $kfWxIncome2, 2);
+        $kfWxCount = bcadd($kfWxCount1, $kfWxCount2);
 
         util::success([
             'systemIncome' => $systemIncome,
             'systemCount' => $systemCount,
-            'systemIncome2' => $systemIncome2,
-            'systemCount2' => $systemCount2,
             'debtCount' => $debtCount,
             'debtIncome' => $debtIncome,
             'kfWxCount' => $kfWxCount,