运输重构

app/Http/ApiControllers/WaybillController.php

@@ -84,7 +84,10 @@ sql;
                 $result[$item->date] = $item->sum!==null ? round((double)$item->sum) : 0.0;
             }
         }
-        $this->response(["waybills"=>$waybills,"mapping"=>$result]);
+        return response()->json(["status_code"=>200,
+            "data"=>["waybills"=>$waybills,"mapping"=>$result],
+            "message"=>null]);
+        //$this->response(["waybills"=>$waybills,"mapping"=>$result]);
     }
 
     /**
@@ -119,7 +122,10 @@ sql;
         $result = Waybill::query()->where("id",$request->input("id"))
             ->update($request->validated());
         if ($result==0)$this->response(false,204,"单据状态发生变化，修改失败");
-        $this->response(true);
+        return response()->json(["status_code"=>200,
+            "data"=>true,
+            "message"=>null]);
+        //$this->response(true);
     }
 
     /**
@@ -151,6 +157,9 @@ sql;
         $param=array('screenDate'=>$deliverAt,'billing'=>$fee);
         $waybills=app('WaybillService')->dailyBilling($param,true);
         if ($waybills===0 || $waybills===1 || !isset($waybills)) $this->response(false);
-        $this->response(true);
+        return response()->json(["status_code"=>200,
+            "data"=>true,
+            "message"=>null]);
+        //$this->response(true);
     }
 }

app/Http/Controllers/TestController.php

@@ -55,7 +55,13 @@ class TestController extends Controller
     }
     public function test(Request $request)
     {
-        dd(getMacAddr());
+        $req = json_decode(
+            <<<json
+{"request":[{"OrderNo":"SO220824002947","CustomerID":"HENIAN-NEW","CarrierID":"BSZFC","ConsigneeName":"\u674e\u521a","C_Tel1":"13386015319,13386015319","C_Address1":"\u6c5f\u82cf\u7701\u82cf\u5dde\u5e02\u5e38\u719f\u5e02\u83ab\u57ce\u8857\u4e1c\u8def3\u53f7\u7199\u9ea6\u957f\u4e09\u89d2\u65f6\u5c1a\u4f9b\u5e94\u94fe\u4e00\u671f3\u697c2\u53f7\u5e93","C_Province":"\u6c5f\u82cf\u7701","C_City":"\u82cf\u5dde\u5e02","C_District":"\u5e38\u719f\u5e02","ReservedField01":"199270842873-SDO516764043198","ReservedField02":null,"ReservedField03":null,"ReservedField04":null,"ReservedField05":null,"order_list":[{"SKU_Descr_c":"Vsinger \u6d1b\u5929\u4f9d 8\u738b\u9f99\u7cfb\u5217\u76d2\u86cb\uff08BOX\uff09","SKU":"6974260921198","Alternate_sku1":"6974260921198","Qtyordered_each":"108","Cubic":"0","GrossWeight":"0","NetWeight":"0","ReservedField01":null,"ReservedField02":null,"ReservedField03":null,"ReservedField04":null,"ReservedField05":null}]}]}
+json
+
+            , true);
+        dd(Http::post("https://api.baoshi56.com/oapi/device/check/waybill/create", $req)->body());
     }
 }
 

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -15,6 +15,7 @@ use App\WMSWaybillOrder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Validator;
 use Ramsey\Uuid\Uuid;
 use Zttp\Zttp;
@@ -32,6 +33,9 @@ class WaybillController extends Controller
                 'errors'=>$errors]]])
                 ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
         }
+        try {
+            Http::post("https://api.baoshi56.com/oapi/device/check/waybill/create", $request->input());
+        } catch (\Exception $e){}
         $receivedInputtings=$request->input('request');
         foreach ($receivedInputtings as $receiveInputting){
             if(!WMSWaybill::query()->create($receiveInputting)){

app/Http/Requests/AndroidGateRequest.php

@@ -31,7 +31,7 @@ class AndroidGateRequest extends FormRequest
         foreach ($authorities as $authority){
             if ($this->method() != Authority::METHOD[$authority->method])continue;
             if ($authority->route == $routeStr)return true; //相等
-            if (strpos($authority->route,"*")===false)continue;//无泛匹配符
+            if (!str_contains($authority->route, "*"))continue;//无泛匹配符
             $route = explode("/",$authority->route);
 
             $crLen = count($routes);

app/Providers/AppServiceProvider.php

@@ -436,8 +436,8 @@ class AppServiceProvider extends ServiceProvider
     {
         Owner::observe(OwnerObserver::class);
         UserWorkgroup::observe(UserWorkGroupObserver::class);
-        Menu::observe(MenuObserver::class);
-        Authority::observe(AuthorityObserver::class);
+        //Menu::observe(MenuObserver::class);
+        //Authority::observe(AuthorityObserver::class);
     }
 
     private function registerProvider()

app/Services/CheckActiveMenuService.php

@@ -76,6 +76,7 @@ class CheckActiveMenuService
      */
     public static function activeMenus()
     {
+        return collect();
         $user_id = self::getUserId();
         $result = collect();
         try {

app/Services/DbOpenService.php

@@ -29,7 +29,9 @@ class DbOpenService
         $body = $this->formatWaybillData($waybill);
         try {
             $response = httpPost(config('api_logistic.DB.prod.uri')['create_order'], $body, $header);
-            if (!$response["result"])return null;
+            if (!$response["result"]) {
+                return null;
+            }
             return $response ?? '';
         }catch (\Exception $e){
             $this->push(__METHOD__."->".__LINE__,"德邦接口请求失败",$e->getMessage() . ' | '.json_encode($response ?? ''));