From f9553c87ac25af705d9f50c52dd3f0d98f27bb31 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 2 Dec 2023 13:57:38 +0800
Subject: [PATCH] =?UTF-8?q?dataview=20=E8=AE=A2=E5=8D=95=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index ffb6775f..83478f41 100644
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -127,7 +127,8 @@ class Order extends BaseController
         $type = $this->request->get('type',2); // 1今日 2总计
         $townList = Db::name('geo_street')->field('street_code,street_name')->where('area_code', $this->areaCode)->select()->toArray(); // 镇/街道列表
         $orderCount = 0;
-        foreach ($townList as &$town) {
+        $townOrderList = [];
+        foreach ($townList as $town) {
             // 查询订单数
             $orderCountQuery = Db::name('product_order_log')->where('street_code', $town['street_code'])->where('status', 1);
             if ($type == 1) {
@@ -136,8 +137,8 @@ class Order extends BaseController
             $tempOrderCount = $orderCountQuery->count();
             $town['order_count'] = $tempOrderCount;
             $orderCount += $tempOrderCount;
+            $townOrderList[] = $town;
         }
-        unset($town);
 //        $orderRankingQuery = Db::name('product_order_log')->alias('op')
 //            ->leftJoin('geo_street s','op.street_code = s.street_code')
 //            ->field('op.street_code,COUNT(op.order_id) AS order_count,s.street_name')
@@ -149,8 +150,8 @@ class Order extends BaseController
 //        }
 //        $orderRankingList = $orderRankingQuery->group('op.street_code')->order('order_count desc')->select();
 
-        $orderCountArr = array_column($townList, 'order_count');
-         array_multisort($orderCountArr, SORT_DESC, $townList);
-        return app('json')->success(compact('orderCount', 'townList'));
+        $orderCountArr = array_column($townOrderList, 'order_count');
+         array_multisort($orderCountArr, SORT_DESC, $townOrderList);
+        return app('json')->success(compact('orderCount', 'townOrderList'));
     }
 }
\ No newline at end of file