diff --git a/admin/controllers/base/FinanceController.php b/admin/controllers/base/FinanceController.php index bbde63d..f6ff3cd 100644 --- a/admin/controllers/base/FinanceController.php +++ b/admin/controllers/base/FinanceController.php @@ -688,6 +688,9 @@ class FinanceController extends BaseAdminController $dateStr = !empty($day) ? 'm-d' : 'Y-m'; $dateArr = !empty($day) ? $day : $month; + foreach ($dateArr as $v) { + if (!isset($saleMoney[$v])) $saleMoney[$v] = '0.00'; + } foreach ($model as $v) { $thisMonth = date($dateStr, $v['created_at']); if (!isset($saleMoney[$thisMonth])) $saleMoney[$thisMonth] = '0.00'; @@ -704,9 +707,6 @@ class FinanceController extends BaseAdminController $drugSaleMoney[$v['drug_type']]['value'] = bcadd($drugSaleMoney[$v['drug_type']]['value'] ?? '0', $v['total_price'], 2); } } - foreach ($dateArr as $v) { - if (!isset($saleMoney[$v])) $saleMoney[$v] = '0.00'; - } return [