Merge remote-tracking branch 'origin/fyy' into fyy

app/Service/FyyOrderService.php

@@ -277,15 +277,25 @@ class FyyOrderService extends Service
     }
 
     public function orderMobileList($data){
-        $list = SaleOrdersProduct::where('del_time',0)
-            ->select('out_order_no')
-            ->where('box_num', '>', 0)
-            ->whereColumn('order_quantity', '>', 'shipment_num')
-            ->groupBy('order_no')
-            ->orderBy('id','desc')
-            ->get()->toArray();
-        $order = array_column($list,'out_order_no');
+        $list = [];
+        if($data['type'] == 1){
+            $list = SaleOrdersProduct::where('del_time',0)
+                ->select('out_order_no')
+                ->where('box_num', '>', 0)
+                ->whereColumn('order_quantity', '>', 'shipment_num')
+                ->groupBy('order_no')
+                ->orderBy('id','desc')
+                ->get()->toArray();
+        }elseif($data['type'] == 2){
+            $list = SaleOrdersProduct::where('del_time',0)
+                ->select('out_order_no')
+                ->whereColumn('order_quantity', '>', 'box_num')
+                ->groupBy('order_no')
+                ->orderBy('id','desc')
+                ->get()->toArray();
+        }
 
+        $order = array_column($list,'out_order_no');
         return [true, $order];
     }
 

routes/api.php

@@ -166,7 +166,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('delOrders','Api\DeleteOrderController@del');
 
     //队列任务错误列表
-    $route->any('errorList','Api\ErrorOpeartionController@errorList');
+    $route->any('errorList','Api\ErrorOperationController@errorList');
 
     $route->any('productList', 'Api\MaterialController@productList');
     $route->any('productEdit', 'Api\MaterialController@edit');