|
|
@@ -64,7 +64,7 @@ class ConsoleController extends BaseController
|
|
|
$hdActualIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日收入金额总数
|
|
|
Yii::info('花店今日收入总笔数:' . $hdActualCount . ', 花店今日收入金额总数:' . $hdActualIncome);
|
|
|
$actualCount = $ghActualCount + $hdActualCount;
|
|
|
- $actualIncome = $ghActIncome + $hdActualIncome;
|
|
|
+ $actualIncome = bcadd($ghActIncome, $hdActualIncome, 2);
|
|
|
|
|
|
|
|
|
//现金收入 23笔 5980元
|
|
|
@@ -84,11 +84,11 @@ class ConsoleController extends BaseController
|
|
|
$hdCachIncome = HdOrderClass::sum($where, 'actPrice'); // 花店今日现金金额总数
|
|
|
Yii::info('花店今日现金总笔数:' . $hdCachCount . ', 花店今日现金金额总数:' . $hdCachIncome);
|
|
|
$cachCount = $ghCachCount + $hdCachCount;
|
|
|
- $cachIncome = $ghCachIncome + $hdCachIncome;
|
|
|
+ $cachIncome = bcadd($ghCachIncome, $hdCachIncome, 2);
|
|
|
|
|
|
|
|
|
//批发欠款 39笔 13980元
|
|
|
- $where = ['shopId' => $this->shopId, 'debt' => 1]; // 重新赋值
|
|
|
+ $where = ['shopId' => $this->shopId, 'debt' => 1];
|
|
|
$where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$ghDebtCount = OrderClass::getCount($where); // 批发今日欠款总笔数
|
|
|
$ghAllDebt = OrderClass::sum($where, 'remainDebtPrice'); // 批发今日总欠款
|
