Merge branch 'hotfix-phoenix'

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(

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) {