fix bug

app-hd/controllers/OrderController.php

@@ -211,7 +211,7 @@ class OrderController extends BaseController
         if ($order->status == 4) {
             util::fail('订单已经送到了');
         }
-        if (in_array($order->sendStatus, [-1, 0, 1, 2, 4, 5])) {
+        if (!in_array($order->sendStatus, [-1, -4])) {
             util::fail('由跑腿送货，无需确认');
         }
         $order->status = 4;

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

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