Merge branch 'yang' into zengjun

app/Filters/OrderPackageFilters.php

@@ -63,8 +63,7 @@ class OrderPackageFilters
 
     private function exception_type($exception_type)
     {
-        $exception_types = array_filter(preg_split('/[,， ]+/is', $exception_type));
-
+        $exception_types = array_filter(preg_split('/[,]+/is', $exception_type));
         $this->queryBuilder->whereIn('exception_type', $exception_types);
     }
 
@@ -140,7 +139,7 @@ class OrderPackageFilters
         $this->queryBuilder->whereIn('order_id', function ($query) {
             $query->from('orders')
                 ->select('id')
-                ->whereNotIn('logistic_id', [13, 24, 25, 26, 27, 30, 31, 32, 33, 34, 60, 63, 65, 66, 68, 70, 102, 105, 107, 116,]);
+                ->whereNotIn('logistic_id', [13, 24, 25, 26, 27, 30, 31, 32, 33, 34, 60, 63, 65, 66, 68, 70, 102, 105, 107, 116, 10, 87]);
         });
     }