1.发现蜂鸟跑腿取消订单也是没有取消订单的回调，所以在各取消API接口主动更新订单状态 2.其它小修改

app-ghs/controllers/DeliveryController.php

@@ -429,7 +429,7 @@ class DeliveryController extends BaseController
             $ghsOrder->sendDistance = 0;
 
             // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
-            if(in_array($platform, ['shunfeng'])){
+            if(in_array($platform, ['shunfeng', 'fengniao'])){
                 $ghsOrder->sendStatus = -1;
                 OrderClass::cancelOrderSend($ghsOrder, ['staffId' => 0, 'staffName' => '']);
 

app-ghs/controllers/UploadController.php

@@ -32,7 +32,7 @@ class UploadController extends BaseController
         $mainId = $this->mainId; // 变动：$this->sjId 改为 $this->mainId
         if (intval($mainId) == 0) {
             Yii::error('------- lose token -------');
-            noticeUtil::push('save-file 无token进行上传文件');
+            noticeUtil::push('save-file 无token进行上传文件 --1');
             return;
         }
         $shopId = $this->shopId;

app-hd/controllers/DeliveryController.php

@@ -300,7 +300,7 @@ class DeliveryController extends BaseController
             $Order = OrderClass::getById($hdOrderId, true, 'id, sendDistance, sendStatus, deliveryId');
             $Order->sendDistance = 0;
 
-            if(in_array($platform, ['shunfeng'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
+            if(in_array($platform, ['shunfeng', 'fengniao'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
                 $Order->sendStatus = -1;
 
                 // 更新跑腿订单与批发订单状态
@@ -317,7 +317,7 @@ class DeliveryController extends BaseController
 
             $Order->status = 2;
             //$Order->deliveryId = '';
-            //$Order->sendTip = 0;
+            //$Order->sendTip = 0; //零售xhOrder表没这个字段
             if (!$Order->save()) {
                 Yii::error('保存批发订单失败: ' . json_encode($Order->errors));
                 util::fail('保存批发订单失败');

app-hd/controllers/UploadController.php

@@ -32,7 +32,7 @@ class UploadController extends BaseController
         $mainId = $this->mainId; // 变动：$this->sjId 改为 $this->mainId
         if (intval($mainId) == 0) {
             Yii::error('------- lose token -------');
-            noticeUtil::push('save-file 无token进行上传文件');
+            noticeUtil::push('save-file 无token进行上传文件 --2');
             return;
         }
         $shopId = $this->shopId;