|
|
@@ -88,19 +88,19 @@ class ConsoleController extends BaseController
|
|
|
//批发欠款 39笔 13980元
|
|
|
$where = ['shopId' => $this->shopId, 'debt' => 1];
|
|
|
$where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
- $ghsDebtCount = OrderClass::getCount($where); // 批发今日欠款总笔数
|
|
|
- $ghsAllDebt = OrderClass::sum($where, 'remainDebtPrice'); // 批发今日总欠款
|
|
|
+ $debtCount = OrderClass::getCount($where); // 批发今日欠款总笔数
|
|
|
+ $debtAmount = OrderClass::sum($where, 'remainDebtPrice'); // 批发今日总欠款
|
|
|
|
|
|
- $actTotalCount = bcadd($cashCount, $ghsDebtCount);
|
|
|
- $actTotalIncome = bcadd($cashIncome, $ghsAllDebt, 2);
|
|
|
+ $actTotalCount = bcadd($cashCount, $ghsCashCount);
|
|
|
+ $actTotalIncome = bcadd($cashIncome, $ghsCashIncome, 2);
|
|
|
|
|
|
util::success([
|
|
|
'systemCount' => $systemCount,
|
|
|
'systemIncome' => $systemIncome,
|
|
|
'cashCount' => $cashCount,
|
|
|
'cashIncome' => $cashIncome,
|
|
|
- 'debtCount' => $ghsDebtCount,
|
|
|
- 'allDebt' => $ghsAllDebt,
|
|
|
+ 'debtCount' => $debtCount,
|
|
|
+ 'debtAmount' => $debtAmount,
|
|
|
'actTotalCount' => $actTotalCount,
|
|
|
'actTotalIncome' => $actTotalIncome,
|
|
|
]);
|
