|
|
@@ -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' => '']);
|
|
|
}
|
|
|
});
|