diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index a843a1852..db3e62ccc 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -95,23 +95,25 @@ class WorkbenchLogic extends BaseLogic $userList = reset_index($userList, 'pay_time'); $orderListTmp = []; $userListTmp = []; + $range = []; for ($i = $timeRange[0]; $i <= $timeRange[1]; $i++) { + $range[] = $i; if (!isset($orderList[$i])) { - $orderListTmp[$i] = ['pay_time' => $i, 'pay_price' => 0]; + $orderListTmp[$i] = 0; } else { - $orderListTmp[$i] = ['pay_time' => $i, 'pay_price' => $orderList[$i]['pay_price']]; + $orderListTmp[$i] = $orderList[$i]['pay_price']; } if (!isset($userList[$i])) { - $userListTmp[$i] = ['pay_time' => $i, 'user_num' => 0]; + $userListTmp[$i] = 0; } else { - $userListTmp[$i] = ['pay_time' => $i, 'user_num' => $userList[$i]['user_num']]; + $userListTmp[$i] = $userList[$i]['user_num']; } } $data['statistics'] = [ - 'range' => array_column($orderListTmp, 'pay_time'), + 'range' => $range, 'data' => [ - array_values($orderListTmp), - array_values($userListTmp) + 'order_amount' => array_values($orderListTmp), + 'user_number' => array_values($userListTmp) ] ]; return $data;