Merge remote-tracking branch 'origin/master'

app/Http/Controllers/api/thirdPart/hengli/OrderIssueController.php

@@ -0,0 +1,28 @@
+<?php
+
+
+namespace App\Http\Controllers\api\thirdPart\hengli;
+
+
+use App\Http\Controllers\Controller;
+use App\Services\OrderIssueService;
+use App\Services\WorkOrderService;
+use Illuminate\Http\Request;
+
+class OrderIssueController extends Controller
+{
+    public function checkInterceptPackage(Request $request)
+    {
+        /** @var WorkOrderService $workOrderService */
+        $workOrderService = app(WorkOrderService::class);
+        /** @var OrderIssueService $workOrderService */
+        $orderIssueService = app(OrderIssueService::class);
+        $logisticNumber = $request['expressCode'] ?? null;
+        if ($workOrderService->isIntercept($logisticNumber) || $workOrderService->isExists($logisticNumber)) {
+            // 显示在问题件已拦截
+            $orderIssueService->intercept($logisticNumber);
+            return ['success' => 'true','data'=> true];
+        }
+        return ['success' => 'true','data'=> false];
+    }
+}

routes/api/thirdPart/hengli.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\api\thirdPart\hengli\PackageController;
+use App\Http\Controllers\api\thirdPart\hengli\OrderIssueController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -8,4 +9,5 @@ use Illuminate\Support\Facades\Route;
 */
 Route::group(['prefix'=>'weight'],function(){
     Route::ANY('new', "PackageController@new_");        //称重上传
+    Route::ANY('checkIntercept','OrderIssueController@checkInterceptPackage');
 });