From 6deeeeea79bb91c048e3195b58babfc6bfd1f153 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sat, 19 Sep 2020 10:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Extensions/MyDetailPage.php | 2 +-
 app/Models/ImsCjdcOrder.php           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index 0761746..eaabc6c 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -25,7 +25,7 @@ class MyDetailPage extends LazyRenderable
         $order = ImsCjdcOrderMain::getOrderData($this->order_id);
         if ($order) {
             //>>2.获取子订单
-            $result = ImsCjdcOrder::getOrdersData($order['global_order_id']);
+            $result = ImsCjdcOrder::getOrdersData($order['global_order_id'],$order['id']);
             $orders = json_encode($result['orders']);
             $showRefund = json_encode($result['show_refund']);
             Admin::script(
diff --git a/app/Models/ImsCjdcOrder.php b/app/Models/ImsCjdcOrder.php
index 850f59a..6526572 100644
--- a/app/Models/ImsCjdcOrder.php
+++ b/app/Models/ImsCjdcOrder.php
@@ -22,11 +22,15 @@ class ImsCjdcOrder extends Model
         return $this->hasOne('\App\Models\LanzuStore','id','store_id');
     }
 
-    public static function getOrdersData($oid)
+    public static function getOrdersData($goid,$oid)
     {
 
         $orders = ImsCjdcOrder::with('user')->with('store')
-            ->where('order_main_id', $oid)->get()->toArray();
+            ->where('order_main_id', $goid)->get()->toArray();
+        if (!count($orders)){
+            $orders = ImsCjdcOrder::with('user')->with('store')
+                ->where('order_main_id', $oid)->get()->toArray();
+        }
         if (count($orders)) {
             $show_refund = [];
             foreach ($orders as &$or) {