|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
|
|
namespace ghs\controllers;
|
|
namespace ghs\controllers;
|
|
|
|
|
|
|
|
|
|
+use biz\stat\classes\StatSaleClass;
|
|
|
use biz\stat\classes\StatStockOutClass;
|
|
use biz\stat\classes\StatStockOutClass;
|
|
|
use biz\stat\services\StatOutService;
|
|
use biz\stat\services\StatOutService;
|
|
|
use bizHd\stat\classes\StatViewClass;
|
|
use bizHd\stat\classes\StatViewClass;
|
|
@@ -29,10 +30,8 @@ class ConsoleController extends BaseController
|
|
|
$customNum = 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.00;
|
|
|
|
|
- $stockOutAmount = StatStockOutClass::getTodayAmount($this->shop);
|
|
|
|
|
- $todayIncome = bcsub($todayIncome, $stockOutAmount, 2);
|
|
|
|
|
|
|
+ $sale = StatSaleClass::getByCondition(['shopId' => $this->shopId, 'time' => date('Ymd')]);
|
|
|
|
|
+ $todaySale = $sale['amount'] ?? 0;
|
|
|
|
|
|
|
|
//2021.4.14 linqh 今日支出
|
|
//2021.4.14 linqh 今日支出
|
|
|
$outData = StatOutService::getTodayNum($this->shopId);
|
|
$outData = StatOutService::getTodayNum($this->shopId);
|
|
@@ -42,7 +41,7 @@ class ConsoleController extends BaseController
|
|
|
$orderNum = $statOrder['riseNum'] ?? 0;
|
|
$orderNum = $statOrder['riseNum'] ?? 0;
|
|
|
$view = StatViewClass::getByCondition(['shopId' => $this->shopId, 'time' => date('Ymd')]);
|
|
$view = StatViewClass::getByCondition(['shopId' => $this->shopId, 'time' => date('Ymd')]);
|
|
|
$viewNum = $view['riseNum'] ?? 0;
|
|
$viewNum = $view['riseNum'] ?? 0;
|
|
|
- $todayData = ['income' => $todayIncome, 'order' => $orderNum, 'custom' => $customNum, 'expend' => $todayOut, 'view' => $viewNum];
|
|
|
|
|
|
|
+ $todayData = ['income' => $todaySale, 'order' => $orderNum, 'custom' => $customNum, 'expend' => $todayOut, 'view' => $viewNum];
|
|
|
|
|
|
|
|
$incomeStat = [];
|
|
$incomeStat = [];
|
|
|
if (httpUtil::isMiniProgram() == false) {
|
|
if (httpUtil::isMiniProgram() == false) {
|