切换分支的无用提交

app/Http/Controllers/WaybillController.php

@@ -180,6 +180,9 @@ class WaybillController extends Controller
             if ($waybill->type=='德邦物流' && !$oldBill){
                 $bill = app('DbOpenService')->getDbOrderNo($waybill);
                 if (!$bill){DB::rollBack();return "获取德邦单号失败,德邦服务异常";}
+                if ($bill["result"]=="false"){
+                    DB::rollBack();return $bill["reason"];
+                }
                 $waybill->update(["carrier_bill"=>$bill['mailNo'],'waybill_number'=>$bill['mailNo'],'station_no' => $bill['stationNo'], 'arrived_org_simple_name' =>$bill['arrivedOrgSimpleName'], 'much_higher_delivery'=>$bill['muchHigherDelivery']]);
                 $msg =  "【申请德邦物流单号：".$bill['mailNo']."】";
                 if (!app("WaybillService")->notifyFlux($waybill))$msg .= ",通知FLUX失败";

app/Services/DbOpenService.php

@@ -35,11 +35,8 @@ class DbOpenService
 
         try {
             $response = httpPost(config('api_logistic.DB.prod.uri')['create_order'], $body, $header);
-            Log::info($body);
-            Log::info($response);
             if (!$response["result"])return null;
             return $response ?? '';
-            //OracleDOCOrderHeader::query()->where('orderno', $order_no)->update(['edittime' => Carbon::now(), 'soreference5' => $mail_no]);
         }catch (\Exception $e){
             $this->push(__METHOD__."->".__LINE__,"德邦接口请求失败",$e->getMessage() . ' | '.json_encode($response ?? ''));
             return null;

resources/views/layouts/app.blade.php

@@ -142,7 +142,7 @@
         li.appendChild(a);
         a.onclick = function (){
 
-            return false;
+            return true;
         };
         return li;
     }