|
|
@@ -195,7 +195,7 @@ class CallBackHandler
|
|
|
private function handleSfCancel($data)
|
|
|
{
|
|
|
return $this->processOrderCallback($data, '顺丰取消订单回调', 'sf_order_id', function($order, $sendStatus, $isGhs, $data) {
|
|
|
- if(!in_array($order->sendStatus, [-2]) && $sendStatus == -2) {
|
|
|
+ if(!in_array($order->sendStatus, [-1, -2]) && in_array($sendStatus, [-1, -2])) {
|
|
|
$cancelCode = $data['cancel_code'];
|
|
|
$event = $this->cancelFrom($sendStatus, $cancelCode);
|
|
|
|
|
|
@@ -222,7 +222,7 @@ class CallBackHandler
|
|
|
private function handleRiderException($data)
|
|
|
{
|
|
|
return $this->processOrderCallback($data, '顺丰订单异常回调', 'sf_order_id', function($order, $sendStatus, $isGhs, $data) {
|
|
|
- if(!in_array($order->sendStatus, [-2]) && $sendStatus == -2){
|
|
|
+ if(!in_array($order->sendStatus, [-1, -2]) && in_array($sendStatus, [-1, -2])){
|
|
|
$exId = $data['ex_id'];
|
|
|
$event = $this->cancelFrom($sendStatus, $exId);
|
|
|
|
|
|
@@ -249,7 +249,7 @@ class CallBackHandler
|
|
|
private function handleRiderRecall($data)
|
|
|
{
|
|
|
return $this->processOrderCallback($data, '顺丰骑士撤单回调', 'sf_order_id', function($order, $sendStatus, $isGhs, $data) {
|
|
|
- if (!in_array($order->sendStatus, [-2]) && $sendStatus == -2) {
|
|
|
+ if (!in_array($order->sendStatus, [-1, -2]) && in_array($sendStatus, [-1, -2])) {
|
|
|
$statusDesc = $data['status_desc'];
|
|
|
|
|
|
if($isGhs){
|