diff --git a/admin/controllers/base/DataController.php b/admin/controllers/base/DataController.php index 8a48388..c9c9795 100644 --- a/admin/controllers/base/DataController.php +++ b/admin/controllers/base/DataController.php @@ -118,6 +118,10 @@ class DataController 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'; + if (!isset($refundMoney[$v])) $refundMoney[$v] = '0.00'; + } foreach ($query as $v) { $thisMonth = date($dateStr, $v['created_at']); $saleMoney[$thisMonth] = bcadd($saleMoney[$thisMonth] ?? '0', $v['total_price'], 2); @@ -136,10 +140,6 @@ class DataController extends BaseAdminController $refundMoney[$thisMonth] = bcadd($refundMoney[$thisMonth] ?? '0', $v['total_price'], 2); } } - foreach ($dateArr as $v) { - if (!isset($saleMoney[$v])) $saleMoney[$v] = '0.00'; - if (!isset($refundMoney[$v])) $refundMoney[$v] = '0.00'; - } // 循环$drugSaleMoney计算药品分类占比 foreach ($drugSaleMoney as $k => $v) { $drugSaleMoney[$k]['percentage'] = bcadd(0, bcdiv($v['value'], $totalMoney, 6) * 100, 4). '%';