今日笔数和总金额代码调整

app-ghs/controllers/ConsoleController.php

@@ -64,8 +64,7 @@ class ConsoleController extends BaseController
         $hdActualIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日收入金额总数
         Yii::info('花店今日收入总笔数:' . $hdActualCount . ', 花店今日收入金额总数:' . $hdActualIncome);
         $systemCount = $ghsOnlineCount + $hdActualCount;
-        $systemIncome = bcadd($ghsActIncome, $hdActualIncome, 2);
-        $systemIncome = floatval($systemIncome);
+        $systemIncome = floatval(bcadd($ghsActIncome, $hdActualIncome, 2)); // 系统收入
 
         //现金收入 23笔  5980元
         //xhGhsOrder actPrice 字段，条件：debtPrice=0 and status in (2,3,4)  and payWay=4
@@ -84,29 +83,27 @@ class ConsoleController extends BaseController
         $hdCashIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日现金金额总数
         Yii::info('花店今日现金总笔数:' . $hdCashCount . ', 花店今日现金金额总数:' . $hdCashIncome);
         $cashCount = $ghsCashCount + $hdCashCount;
-        $cashIncome = bcadd($ghsCashIncome, $hdCashIncome, 2);
-        $cashIncome = floatval($cashIncome);
+        $cashIncome = floatval(bcadd($ghsCashIncome, $hdCashIncome, 2)); // 现金收入
+
+        $actTotalCount = $cashCount + $systemCount;
+        $actTotalIncome = floatval(bcadd($cashIncome, $systemIncome, 2)); // 收入合计 = 系统收入 + 现金收入
 
         //批发欠款 39笔 13980元
         $where = ['shopId' => $this->shopId, 'debt' => 1];
         $where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
         $debtCount = OrderClass::getCount($where); // 批发今日欠款总笔数
-        $debtAmount = OrderClass::sum($where, 'remainDebtPrice'); // 批发今日总欠款
+        $debtAmount = OrderClass::sum($where, 'remainDebtPrice'); // 欠款 // 批发今日总欠款
         $debtAmount = floatval($debtAmount);
 
-        $actTotalCount = bcadd($cashCount, $ghsCashCount);
-        $actTotalIncome = bcadd($cashIncome, $ghsCashIncome, 2);
-        $actTotalIncome = floatval($actTotalIncome);
-
         util::success([
             'systemCount' => $systemCount,
-            'systemIncome' => $systemIncome,
+            'systemIncome' => $systemIncome, // 系统收入
             'cashCount' => $cashCount,
-            'cashIncome' => $cashIncome,
-            'debtCount' => $debtCount,
-            'debtAmount' => $debtAmount,
+            'cashIncome' => $cashIncome, // 现金收入
             'actTotalCount' => $actTotalCount,
-            'actTotalIncome' => $actTotalIncome,
+            'actTotalIncome' => $actTotalIncome, // 收入合计
+            'debtCount' => $debtCount,
+            'debtAmount' => $debtAmount, // 欠款
         ]);
     }