|
|
@@ -66,7 +66,7 @@ class ConsoleController extends BaseController
|
|
|
$hdActualIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日收入金额总数
|
|
|
Yii::info('花店今日收入总笔数:' . $hdActualCount . ', 花店今日收入金额总数:' . $hdActualIncome);
|
|
|
$systemCount = $ghsOnlineCount + $hdActualCount;
|
|
|
- $systemIncome = floatval(bcadd($ghsActIncome, $hdActualIncome, 2)); // 系统收入
|
|
|
+ $systemIncome = floatval(bcadd($ghsActIncome, $hdActualIncome, 2)); // 扫码收入
|
|
|
|
|
|
//现金收入 23笔 5980元
|
|
|
//xhGhsOrder actPrice 字段，条件：debtPrice=0 and status in (2,3,4) and payWay=4
|
|
|
@@ -103,15 +103,15 @@ class ConsoleController extends BaseController
|
|
|
$where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$clearCount = ClearClass::getCount($where);
|
|
|
$clearIncome = ClearClass::sum($where, 'actPrice');
|
|
|
- $clearIncome = empty($clearIncome) ? 0 : $clearIncome;
|
|
|
+ $clearIncome = empty($clearIncome) ? 0 : floatval($clearIncome);
|
|
|
|
|
|
$actTotalCount = $cashCount + $systemCount + $clearCount;
|
|
|
$actTotalIncome = bcadd($cashIncome, $systemIncome, 2);
|
|
|
- $actTotalIncome = floatval(bcadd($actTotalIncome, $clearIncome, 2)); // 收入合计 = 系统收入 + 现金收入 + 结帐收入
|
|
|
+ $actTotalIncome = floatval(bcadd($actTotalIncome, $clearIncome, 2)); // 收入合计 = 扫码收入 + 现金收入 + 结帐收入
|
|
|
|
|
|
util::success([
|
|
|
'systemCount' => $systemCount,
|
|
|
- 'systemIncome' => $systemIncome, // 系统收入
|
|
|
+ 'systemIncome' => $systemIncome, // 扫码收入
|
|
|
'cashCount' => $cashCount,
|
|
|
'cashIncome' => $cashIncome, // 现金收入
|
|
|
'clearCount' => $clearCount,
|
