From 2c2baf413583ccbb356ce176bcb516a41b34a738 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Jun 2024 11:07:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9C=A8Sto?=
 =?UTF-8?q?reOrderLists=E5=92=8CStoreOrderController=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/store_order/StoreOrderLists.php           | 8 ++++----
 app/store/controller/store_order/StoreOrderController.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php
index fc4051333..5b2e2d84f 100644
--- a/app/admin/lists/store_order/StoreOrderLists.php
+++ b/app/admin/lists/store_order/StoreOrderLists.php
@@ -69,10 +69,10 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
                 }
                 $product = StoreOrderCartInfo::where('oid', $item['id'])->field(['id', 'oid', 'product_id', 'cart_info'])
                     ->limit(3)->select();
-                foreach ($product as &$items) {
-                    $items['store_name'] = $items['cart_info']['name'];
-                    $items['image'] = $items['cart_info']['image'];
-                }
+                        foreach ($product as &$items) {
+                            $items['store_name'] = $items['cart_info']['name'];
+                            $items['image'] = $items['cart_info']['image'];
+                        }
                 $item['product'] = $product;
                 return $item;
             })
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index 4b7295af4..d7bc50d1b 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -169,7 +169,7 @@ class StoreOrderController extends BaseAdminController
             $user = User::where('id', $uid)->find();
         }
         $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单
-        $order = StoreOrderLogic::createOrder($cartId, $addressId, $user, $params);
+        $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
         if ($order != false) {
             switch ($pay_type) {
                 case PayEnum::PURCHASE_FUNDS: