From 15d886e0d4badaab0fd14bb7b4681571c4f33807 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sun, 4 Feb 2024 09:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E5=8F=91=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 3 +++
 app/controller/merchant/store/order/Order.php                | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index f329cc5b..412f8934 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -2420,6 +2420,9 @@ class StoreOrderRepository extends BaseRepository
     public function childrenList($id, $merId)
     {
         $data = $this->dao->get($id);
+        if (empty($data)) {
+            return [];
+        }
         $query = $this->dao->getSearch([])->with(['orderProduct'])->where('order_id', '<>', $id);
         if ($merId) $query->where('mer_id', $merId);
         if ($data['main_id']) {
diff --git a/app/controller/merchant/store/order/Order.php b/app/controller/merchant/store/order/Order.php
index 7429969c..98ea1511 100755
--- a/app/controller/merchant/store/order/Order.php
+++ b/app/controller/merchant/store/order/Order.php
@@ -478,7 +478,6 @@ class Order extends BaseController
 
     public function childrenList($id)
     {
-        return app('json')->success([]);
         $data = $this->repository->childrenList($id, $this->request->merId());
         return app('json')->success($data);
     }