fyy

app/Service/Box/BoxHookService.php

@@ -157,19 +157,24 @@ class BoxHookService extends Service
      * @return array
      */
     public function boxDetail($data){
+//        var_dump($data);
         if(isset($data['top_order_no'])) $top_order_no = $data['top_order_no'];
         else $top_order_no = Box::where('order_no',$data['order_no'])->value('top_order_no');
         $box = new BoxDetail(['channel'=>$top_order_no]);
-        $list = [];
+//        $list = [];
+        $box = $box->where('top_order_no',$top_order_no);
         if(isset($data['id'])) {
-            $list = $box->where('top_id',$data['id'])->get()->toArray();
+            $box = $box->where('top_id',$data['id']);
         }
-        elseif(isset($data['order_no'])){
-            $list = $box->where('order_no',$data['order_no'])->get()->toArray();
+        if(isset($data['order_no'])){
+            $box = $box->where('order_no',$data['order_no']);
         }
+//        var_dump($box->toSql());
+        $box = $box->get()->toArray();
+//        var_dump($box);die;
 
 
-        return [true,$list];
+        return [true,$box];
 
     }