From 80b608dac230ec518ed818cd3e69daaf4ebd358a Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 22 Nov 2024 18:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=A1=8C=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/OrderLogic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
index 494f54e9..342822aa 100755
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -3299,11 +3299,12 @@ class OrderLogic extends Logic
             $cancelTime = strtotime($order['create_time']) + intval($cancelTime) * 60;
         }
         $payway = array_values($payway);
+        $shop_id = isset($order['shop_id'])?$order['shop_id']:0;
         return [
             'pay_way' => $payway,
             'order_amount' => $order['order_amount'],
             'cancel_time' => $cancelTime,
-            'shop_id'=>isset($order['shop_id'])?$order['shop_id']:0
+            'shop_id'=>$shop_id
         ];
     }