修改蜂鸟授权回调接口

app-ghs/controllers/DeliveryController.php

@@ -6,6 +6,7 @@ use bizGhs\express\classes\GhsDeliveryOrderClass;
 use bizGhs\express\classes\DeliveryAuthTokenClass;
 use bizGhs\order\classes\OrderClass;
 use common\components\delivery\services\adapter\HuolalaAdapter;
+use common\components\noticeUtil;
 use common\components\util;
 use common\components\delivery\services\DispatchService;
 use ghs\models\delivery\CancelOrderForm;
@@ -753,25 +754,22 @@ class DeliveryController extends BaseController
      */
     public function actionFengniaoAuthCallback()
     {
-        $get = Yii::$app->request->get();
-        $getData = json_encode($get, JSON_UNESCAPED_UNICODE);
-        Yii::info($getData);
-
         $callbackData = Yii::$app->request->post();
         if (empty($callbackData)) {
-            $postStr = file_get_contents('php://input');
-            $callbackData = json_decode($postStr, true);
-            if (empty($callbackData)) {
-                Yii::info('回调请求的数据为空');
-            }
+            Yii::error('回调请求的数据为空');
         }
         Yii::info('蜂鸟授权回调：' . json_encode($callbackData, JSON_UNESCAPED_UNICODE), 'fengniao');
 
-        $mainId = $get['mainId'];
-        $code = $get['code'];
-        $merchantId = $get['merchant_id'];
-        $scope = $get['scope'];
-        $state = $get['state'];
+        if(!isset($callbackData['main_id'])){
+            Yii::error('蜂鸟授权回调的回调地址 authCallbackUrl 中没有带 main_id');
+            noticeUtil::push('蜂鸟授权回调的回调地址 authCallbackUrl 中没有带 main_id，回调数据：' . json_encode($callbackData, JSON_UNESCAPED_UNICODE), 'fengniao');
+        }
+
+        $mainId = $callbackData['main_id'];
+        $code = $callbackData['code'];
+        $merchantId = $callbackData['merchant_id'];
+        $scope = $callbackData['scope'];
+        $state = $callbackData['state'];
 
         // 获取AccessToken
         $auth = new \common\components\delivery\platform\fengniao\Auth();

app-hd/controllers/IntraCityController.php

@@ -17,7 +17,6 @@ use common\components\util;
 use hd\models\IntraCity\StoreFeeForm;
 use Yii;
 use biz\shop\classes\ShopClass;
-use yii\helpers\Json;
 use common\components\IntraCityExpress;
 use yii\db\Query;
 use biz\wx\classes\WxMessageClass;