fix bug

common/components/delivery/services/DispatchService.php

@@ -148,8 +148,9 @@ class DispatchService
         }
 
         if ($adapter instanceof FengniaoAdapter) {
+            $deliveryOrder = $this->getDeliveryOrder($orderId, 'fengniao');
             //order_id 和 partner_order_code 必填一个
-            return $adapter->selectOrder(['order_id'=>$thirdOrderNo]);
+            return $adapter->selectOrder(['order_id'=>$deliveryOrder['orderId']]);
         }
 
         if ($adapter instanceof ShunfengAdapter) {

common/components/delivery/services/adapter/FengniaoAdapter.php

@@ -664,7 +664,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
         $orderId = $data['order_id'] ?? $data;
         $partnerOrderCode = null;
         // 如果 $orderId 是 XSD 开头，则给 partnerOrderCode 赋值为 $orderId
-        if (strpos($orderId, 'XSD') == 0) {
+        if (strpos($orderId, 'XSD') === 0) {
             $partnerOrderCode = $orderId;
             $orderId = null;
         }
@@ -770,7 +770,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
         // 验证 order_id 和 partner_order_code 必填一个
         $partnerOrderCode = null;
         // 如果 $orderId 是 XSD_ 开头，则给 partnerOrderCode 赋值为 $orderId
-        if (strpos($orderId, 'XSD') == 0) {
+        if (strpos($orderId, 'XSD') === 0) {
             $partnerOrderCode = $orderId;
             $orderId = null;
         }
@@ -920,7 +920,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
         $orderId = $data['order_id'];
         $partnerOrderCode = null;
         // 如果 $orderId 是 XSD_ 开头，则给 partnerOrderCode 赋值为 $orderId
-        if (strpos($orderId, 'XSD') == 0) {
+        if (strpos($orderId, 'XSD') === 0) {
             $partnerOrderCode = $orderId;
             $orderId = null;
         }
@@ -1139,7 +1139,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
         $orderId = $data['order_id'] ?? $data;
         $partnerOrderCode = null;
         // 如果 $orderId 是 XSD 开头，则给 partnerOrderCode 赋值为 $orderId
-        if (strpos($orderId, 'XSD') == 0) {
+        if (strpos($orderId, 'XSD') === 0) {
             $partnerOrderCode = $orderId;
             $orderId = null;
         }