修改OrderIssueFilter 方法顺序

修改OrderIssueService _construct

app/Filters/OrderIssueFilter.php

@@ -171,6 +171,37 @@ class OrderIssueFilter
         }
     }
 
+    public function afterApply()
+    {
+        if($this->commodityQuery)
+            $this->getOrderPackageCommodityQuery()->whereIn('commodity_id',$this->commodityQuery);
+
+        if($this->orderPackageCommodityQuery)
+            $this->getOrderPackageQuery()->whereIn('order_packages.id',$this->orderPackageCommodityQuery);
+
+        if($this->orderPackageQuery)
+            $this->getOrderQuery()->whereIn('order_id',$this->orderPackageQuery);
+
+        if($this->shopQuery)
+            $this->getOrderQuery()->whereIn('shop_id',$this->shopQuery);
+
+        if($this->orderQuery)
+            $this->queryBuilder->whereIn('order_issues.order_id',$this->orderQuery);
+
+        if($this->rejectedBillItemQuery)
+            $this->getRejectedBillQuery()->whereIn('id',$this->rejectedBillItemQuery);
+
+        if($this->rejectedBillQuery)
+            $this->getOrderIssueRejectedBIllQuery()->whereIn('logistic_number_return',$this->rejectedBillQuery);
+
+        if($this->orderIssueRejectedBIllQuery)
+            $this->queryBuilder->whereIn('order_issues.id',$this->orderIssueRejectedBIllQuery);
+
+        if($this->orderIssueProcessLogQuery)
+            $this->queryBuilder->whereIn('order_issues.id',$this->orderIssueProcessLogQuery);
+
+    }
+
     private function isSearchLike($str)
     {
         if (substr($str, 0, 1) == "%" || substr($str, strlen($str) - 1, 1) == "%") {
@@ -382,35 +413,4 @@ class OrderIssueFilter
         $this->queryBuilder->where('order_issues.finance_confirm',$finance_confirm);
     }
 
-    public function afterApply()
-    {
-        if($this->commodityQuery)
-            $this->getOrderPackageCommodityQuery()->whereIn('commodity_id',$this->commodityQuery);
-
-        if($this->orderPackageCommodityQuery)
-            $this->getOrderPackageQuery()->whereIn('order_packages.id',$this->orderPackageCommodityQuery);
-
-        if($this->orderPackageQuery)
-            $this->getOrderQuery()->whereIn('order_id',$this->orderPackageQuery);
-
-        if($this->shopQuery)
-            $this->getOrderQuery()->whereIn('shop_id',$this->shopQuery);
-
-        if($this->orderQuery)
-            $this->queryBuilder->whereIn('order_issues.order_id',$this->orderQuery);
-
-        if($this->rejectedBillItemQuery)
-            $this->getRejectedBillQuery()->whereIn('id',$this->rejectedBillItemQuery);
-
-        if($this->rejectedBillQuery)
-            $this->getOrderIssueRejectedBIllQuery()->whereIn('logistic_number_return',$this->rejectedBillQuery);
-
-        if($this->orderIssueRejectedBIllQuery)
-            $this->queryBuilder->whereIn('order_issues.id',$this->orderIssueRejectedBIllQuery);
-
-        if($this->orderIssueProcessLogQuery)
-            $this->queryBuilder->whereIn('order_issues.id',$this->orderIssueProcessLogQuery);
-
-    }
-
 }

app/Services/OrderIssueService.php

@@ -24,12 +24,6 @@ use App\Traits\ServiceAppAop;
 class OrderIssueService
 {
     use ServiceAppAop;
-    public function __construct()
-    {
-        app()->bind("orderService", OrderService::class);
-        app()->bind("rejectedService", RejectedService::class);
-        app()->bind("orderPackageCommoditiesService", OrderPackageCommoditiesService::class);
-    }
 
     public function insert($params)
     {