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