|
|
@@ -5,6 +5,7 @@ namespace ghs\controllers;
|
|
|
use biz\shop\services\ShopService;
|
|
|
use biz\sj\services\MerchantAssetService;
|
|
|
use biz\stat\services\StatOutService;
|
|
|
+use bizHd\stat\classes\StatViewClass;
|
|
|
use bizHd\stat\services\StatIncomeMonthService;
|
|
|
use bizHd\stat\services\StatIncomeService;
|
|
|
use bizHd\stat\services\StatOrderService;
|
|
|
@@ -30,17 +31,19 @@ class ConsoleController extends BaseController
|
|
|
];
|
|
|
//今天客户与粉丝数
|
|
|
$userData = StatUserService::getTodayNum($this->shopId);
|
|
|
- $todayUserNum = isset($userData['riseUserNum']) ? $userData['riseUserNum'] : 0;
|
|
|
+ $customNum = isset($userData['riseUserNum']) ? $userData['riseUserNum'] : 0;
|
|
|
//今天收入
|
|
|
$incomeData = StatIncomeService::getTodayNum($this->shopId);
|
|
|
- $todayIncome = isset($incomeData['amount']) ? $incomeData['amount'] : 0;
|
|
|
+ $todayIncome = isset($incomeData['amount']) ? $incomeData['amount'] : 0.00;
|
|
|
//2021.4.14 linqh 今日支出
|
|
|
$outData = StatOutService::getTodayNum($this->shopId);
|
|
|
- $todayOut = $outData['amount'] ?? 0;
|
|
|
+ $todayOut = $outData['amount'] ?? '0.00';
|
|
|
//今天开单数
|
|
|
$statOrder = \bizHd\stat\classes\StatOrderClass::getByCondition(['shopId' => $this->shopId, 'time' => date('Ymd')]);
|
|
|
$orderNum = $statOrder['riseNum'] ?? 0;
|
|
|
- $todayData = ['income' => $todayIncome, 'order' => $orderNum, 'custom' => $todayUserNum, 'expend' => $todayOut];
|
|
|
+ $view = StatViewClass::getByCondition(['shopId' => $this->shopId, 'time' => date('Ymd')]);
|
|
|
+ $viewNum = $view['riseNum'] ?? 0;
|
|
|
+ $todayData = ['income' => $todayIncome, 'order' => $orderNum, 'custom' => $customNum, 'expend' => $todayOut, 'view' => $viewNum];
|
|
|
|
|
|
$incomeStat = [];
|
|
|
if (httpUtil::isMiniProgram() == false) {
|
|
|
@@ -57,7 +60,6 @@ class ConsoleController extends BaseController
|
|
|
'list' => $latestIncome,
|
|
|
];
|
|
|
}
|
|
|
-
|
|
|
util::success([
|
|
|
'asset' => $asset,
|
|
|
'notice' => $notice,
|