o2o配送费详情规范代码

backend/controllers/v1/common/ShopTransportAreaController.php

@@ -39,12 +39,12 @@ class ShopTransportAreaController extends BaseController
                 $whereArr
             );
         return new ActiveDataProvider(
-            array(
+            [
                 'query' => $areas,
                 'pagination' => [
                     'pageSize' => 0,
                 ]
-            )
+            ]
         );
     }
 

backend/controllers/v1/transport/O2oDeliveryController.php

@@ -150,16 +150,15 @@ class O2oDeliveryController extends BaseController
                     ->andFilterWhere(['scds.SETTING_TYPE'=>O2O_FLAG])//设定为o2o配送
                     ->andFilterWhere(['sb.GUID'=>$branchGuid])
                     ->andFilterWhere(['scds.GUID'=>$model->GUID])
-                    ->orFilterWhere(['sb.PARENTGUID'=>$parentBranchGuid])
                     ->asArray()->all();
             return new ArrayDataProvider(
                 [
                     'allModels' => $infoArr,
+                    'pagination' => false
                 ]
             );
         }else{
-            Yii::$app->response->statusCode = 422;
-            return $model->errors;
+            return $model;
         }
         
     }