From 349e2573d989acf5a9a659a4f532c5c5a4cd7bfb Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 7 Jun 2024 17:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/logic/WorkbenchLogic.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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;