diff --git a/app/Controller/v3/HomeController.php b/app/Controller/v3/HomeController.php index f329596..35caaf4 100644 --- a/app/Controller/v3/HomeController.php +++ b/app/Controller/v3/HomeController.php @@ -224,8 +224,16 @@ class HomeController extends BaseController ]; $sumAmounts = $this->financialRecordService->sumAmountGroup($userId, UserType::STORE, $type, $dayStartTime, $dayEndTime); - $data['order_online']['total'] = bcsub($sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OL_ORDER_COMP],$sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OL_ORDER_DIRECT_REFUND], 2); - $data['order_offline']['total'] = bcadd($sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OFL_ORDER_COMP],'0',2); + $data['order_online']['total'] = bcsub( + ($sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OL_ORDER_COMP]??'0'), + ($sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OL_ORDER_DIRECT_REFUND]??'0'), + 2 + ); + $data['order_offline']['total'] = bcadd( + ($sumAmounts[FinancialRecord::MONEY_TYPE_STORE_OFL_ORDER_COMP]??'0'), + '0', + 2 + ); // $revenueByOrder = $this->revenueListService->getRevenueByUser($userId,$type,$dayStartTime,$dayEndTime); // foreach ($revenueByOrder as $order){ // if($order['money_type'] == FinancialRecord::MONEY_TYPE_STORE_OL_ORDER_COMP){