增加结帐收入

app-ghs/controllers/ConsoleController.php

@@ -4,6 +4,7 @@ namespace ghs\controllers;
 
 use biz\stat\classes\StatSaleClass;
 use biz\stat\services\StatOutService;
+use bizGhs\clear\classes\ClearClass;
 use bizGhs\order\classes\OrderClass;
 use bizHd\order\classes\OrderClass as HdOrderClass;
 use bizHd\stat\classes\StatVisitClass;
@@ -79,7 +80,7 @@ class ConsoleController extends BaseController
         Yii::info('批发今日现金总笔数:' . $ghsCashCount . ', 批发今日现金金额总数:' . $ghsCashIncome);
 
         $where['shopId'] = $this->shop['lsShopId'];
-        $where['onlinePay'] = 2;
+        $where['onlinePay'] = 2; // 花店 xhOrder 表的 onlinePay 字段是指：钱是否进入公司的帐户 --  1不是 2是
         unset($where['debt']);
         unset($where['debtPrice']);
         $hdCashCount = HdOrderClass::getCount($where); // 花店今日现金总笔数
@@ -98,6 +99,14 @@ class ConsoleController extends BaseController
         $debtAmount = OrderClass::sum($where, 'remainDebtPrice'); // 欠款 // 批发今日总欠款
         $debtAmount = floatval($debtAmount);
 
+        //结帐收入
+        $where = ['ghsShopId' => $this->shopId];
+        $where['status'] = 2;
+        $where['onlinePay'] = 2;
+        $where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
+        $clearCount = ClearClass::getCount($where);
+        $clearIncome = ClearClass::sum($where, 'actPrice');
+
         util::success([
             'systemCount' => $systemCount,
             'systemIncome' => $systemIncome, // 系统收入
@@ -105,6 +114,8 @@ class ConsoleController extends BaseController
             'cashIncome' => $cashIncome, // 现金收入
             'actTotalCount' => $actTotalCount,
             'actTotalIncome' => $actTotalIncome, // 收入合计
+            'clearCount' => $clearCount,
+            'clearIncome' => $clearIncome, // 结帐收入
             'debtCount' => $debtCount,
             'debtAmount' => $debtAmount, // 欠款
         ]);