From 8f698e0bcdd82657bcff73d6cf5ec12f47e99e8c Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 15 Mar 2024 16:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index a1f38313..381d60c3 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -1817,17 +1817,17 @@ class StoreOrderRepository extends BaseRepository
             $order->takeOrderCount = count($order['takeOrderList']);
             unset($order['takeOrderList']);
         }
-        $orders = $list->toArray();
-        $merIds = array_unique(array_column($orders, 'mer_id'));
+        $list = $list->toArray();
+        $merIds = array_unique(array_column($list, 'mer_id'));
         /** @var ProductLabelRepository $labelRepo */
         $labelRepo = app()->make(ProductLabelRepository::class);
-        foreach ($orders as &$order) {
+        foreach ($list as &$order) {
             $labelRepo->isOrder = true;
             $labelRepo->merTypeId = $order['merchant']['type_id'];
             $labelRepo->isWholeSale = $order['sale_type'] == Enum::SALE_TYPE_WHOLESALE;
             $order['orderProduct'] = $labelRepo->appendLabel($merIds, $order['orderProduct']);
         }
-        return compact( 'count','orders');
+        return compact( 'count','list');
     }
 
     public function userList($uid, $page, $limit)