Эх сурвалжийг харах

执行OrderClass::cancelOrderSend()前,判断是否 !in_array($order->sendStatus, [-2, -1])

shizhongqi 8 сар өмнө
parent
commit
97f54e4ecb

+ 1 - 1
common/components/delivery/platform/fengniao/CallBackNotify.php

@@ -66,7 +66,7 @@ class CallBackNotify
             if ($sendStatus == 5) {
                 OrderClass::confirmReach($order, ['staffId' => 0, 'staffName' => '']);
             }
-            if ($sendStatus == -1 || $sendStatus == -2) {
+            if (!in_array($order->sendStatus, [-2, -1]) && ($sendStatus == -1 || $sendStatus == -2)) {
                 OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
             }
 

+ 1 - 1
common/components/delivery/platform/huolala/CallBackHandler.php

@@ -69,7 +69,7 @@ class CallBackHandler
                     if ($sendStatus == 5) {
                         OrderClass::confirmReach($order, ['staffId' => 0, 'staffName' => '']);
                     }
-                    if ($sendStatus == -1 || $sendStatus == -2) {
+                    if (!in_array($order->sendStatus, [-2, -1]) && ($sendStatus == -1 || $sendStatus == -2)) {
                         OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
                     }
 

+ 1 - 1
common/components/delivery/platform/shansong/OrderStatusCallBack.php

@@ -70,7 +70,7 @@ class OrderStatusCallBack
                     if ($sendStatus == 5) {
                         OrderClass::confirmReach($order, ['staffId' => 0, 'staffName' => '']);
                     }
-                    if ($sendStatus == -1 || $sendStatus == -2) {
+                    if (!in_array($order->sendStatus, [-2, -1]) && ($sendStatus == -1 || $sendStatus == -2)) {
                         OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
                     }
 

+ 2 - 2
common/components/delivery/platform/shunfeng/CallBackHandler.php

@@ -192,7 +192,7 @@ class CallBackHandler
     private function handleSfCancel($data)
     {
         return $this->processOrderCallback($data, '顺丰取消订单回调', 'sf_order_id', function($order, $sendStatus, $isGhs) {
-            if ($isGhs && $sendStatus == -1) {
+            if ($isGhs && !in_array($order->sendStatus, [-2, -1]) && $sendStatus == -1) {
                 OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
             }
         });
@@ -208,7 +208,7 @@ class CallBackHandler
     private function handleRiderException($data)
     {
         return $this->processOrderCallback($data, '顺丰订单异常回调', 'sf_order_id', function($order, $sendStatus, $isGhs) {
-            if ($isGhs && $sendStatus == -2) {
+            if ($isGhs && !in_array($order->sendStatus, [-2, -1]) && $sendStatus == -2) {
                 OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
             }
         });