数量

app-ghs/controllers/ConsoleController.php

@@ -63,8 +63,8 @@ class ConsoleController extends BaseController
         $hdActualCount = HdOrderClass::getCount($where); // 花店今日收入总笔数
         $hdActualIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日收入金额总数
         Yii::info('花店今日收入总笔数:' . $hdActualCount . ', 花店今日收入金额总数:' . $hdActualIncome);
-        $actualCount = $ghsOnlineCount + $hdActualCount;
-        $actualIncome = bcadd($ghsActIncome, $hdActualIncome, 2);
+        $systemCount = $ghsOnlineCount + $hdActualCount;
+        $systemIncome = bcadd($ghsActIncome, $hdActualIncome, 2);
 
         //现金收入 23笔  5980元
         //xhGhsOrder actPrice 字段，条件：debtPrice=0 and status in (2,3,4)  and payWay=4
@@ -91,18 +91,18 @@ class ConsoleController extends BaseController
         $ghsDebtCount = OrderClass::getCount($where); // 批发今日欠款总笔数
         $ghsAllDebt = OrderClass::sum($where, 'remainDebtPrice'); // 批发今日总欠款
 
-        $totalCount = bcadd($cashCount, $ghsDebtCount);
-        $totalIncome = bcadd($cashIncome, $ghsAllDebt, 2);
+        $actTotalCount = bcadd($cashCount, $ghsDebtCount);
+        $actTotalIncome = bcadd($cashIncome, $ghsAllDebt, 2);
 
         util::success([
-            'actualCount' => $actualCount,
-            'actualIncome' => $actualIncome,
+            'systemCount' => $systemCount,
+            'systemIncome' => $systemIncome,
             'cashCount' => $cashCount,
             'cashIncome' => $cashIncome,
             'debtCount' => $ghsDebtCount,
             'allDebt' => $ghsAllDebt,
-            'totalCount' => $totalCount,
-            'totalIncome' => $totalIncome,
+            'actTotalCount' => $actTotalCount,
+            'actTotalIncome' => $actTotalIncome,
         ]);
     }