From b4ba19e09799827bfeb9f5ece8a097f466c83870 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 19 Aug 2023 14:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E6=9C=AA?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreGroupOrderRepository.php          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index 95cba808..e9e09742 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -83,13 +83,13 @@ class StoreGroupOrderRepository extends BaseRepository
             $query->where('StoreGroupOrder.is_del', 0);
         });
         $count = $query->count();
-        $list = $query->with(['orderList' => function (Relation $query) {
+        $groupList = $query->with(['orderList' => function (Relation $query) {
             $query->field('order_id,group_order_id,activity_type,pay_price,status,mer_id')->with(['merchant' => function ($query) {
                 $query->field('mer_id,mer_name,settle_cycle,interest_rate');
             }, 'orderProduct','presellOrder']);
         }, 'interest'])->page($page, $limit)->order('create_time DESC')->select();
-        $return = [];
-        foreach ($list as $k => $item) {
+        $list = [];
+        foreach ($groupList as $k => $item) {
             $current = $item->toArray();
             if (!empty($item->interest)) {
                 $interest = $item->interest->calculateInterest();
@@ -97,9 +97,9 @@ class StoreGroupOrderRepository extends BaseRepository
             } else {
                 $current['interest']['total_amount'] = $item['total_price'];
             }
-            $return[] = $current;
+            $list[] = $current;
         }
-        return compact('count', 'return');
+        return compact('count', 'list');
     }
 
     /**