今日实收修改

app-ghs/controllers/ConsoleController.php

@@ -21,7 +21,8 @@ class ConsoleController extends BaseController
         $todayDate = date('Y-m-d');
         $todayStartTime = $todayDate . ' 00:00:00';
         $todayEndTime = $todayDate . ' 23:59:59';
-        $where = ['shopId' => $this->shopId, 'debt' => 0, 'payStatus' => 2];
+        $where = ['shopId' => $this->shopId, 'debt' => 0];
+        $where['payStatus'] = ['in', [2,3,4]];
         $where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
         $todayActIncome = OrderClass::sum($where, 'actPrice'); // 今日实收
         $todayActIncome = $todayActIncome === null ? 0 : $todayActIncome;
@@ -32,7 +33,7 @@ class ConsoleController extends BaseController
         $todayDebt = $todayDebt === null ? 0 : $todayDebt;
 
         $where = ['shopId' => $this->shopId, 'debt' => 1]; // 重新赋值
-        $totalDebt = OrderClass::sum($where, 'debtPrice'); // 总欠款
+        $totalDebt = OrderClass::sum($where, 'remainDebtPrice'); // 总欠款
         $totalDebt = $totalDebt === null ? 0 : $totalDebt;
 
         util::success(['todayActIncome' => $todayActIncome, 'todayDebt' => $todayDebt, 'totalDebt' => $totalDebt]);