门店详情修改

Signed-off-by: sunlei <sunlei@romens.cn>

backend/controllers/v1/branch/BranchController.php

@@ -118,7 +118,7 @@ class BranchController extends BaseController
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
             $info = $model->BranchDetail($params['GUID']);
-            if (!$info) {
+            if (!$list = $info->getModels()) {
                 throw new BadRequestHttpException('未找到符合的门店列表信息');
             }
             //获取门店服务类目关系信息
@@ -139,7 +139,11 @@ class BranchController extends BaseController
                     }
                 }
             }
-            $info['BRANCH_SERVICE_TYPE'] = $branchServiceRelation;
+            //组合数据
+            foreach ($list as $key => $val) {
+                $list[$key]['BRANCH_SERVICE_TYPE'] = $branchServiceRelation;
+            }
+            $info->setModels($list);
             return $info;
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
@@ -1004,7 +1008,7 @@ class BranchController extends BaseController
         $guid = Yii::$app->request->getQueryParam('guid');
 
         $info = $model->BranchDetail($guid);
-        if (!$info) {
+        if (!$info->getModels()) {
             throw new BadRequestHttpException('未找到符合的DC信息');
         }
         return $info;

backend/models/v1/branch/ShopBranch.php

@@ -355,11 +355,14 @@ class ShopBranch extends BaseModel
             ->select('GUID,NAME,CODE,LICENCE_IMAGE_PATH,RECIVER_PROVINCE,RECIVER_CITY,RECIVER_REGION,ADDRESS,PARENT_GUID,
             LAT,LNG,IS_POINTS_SHOP,DESCRIPTION,BRANCH_NAME,BRANCH_IMAGE_PATH,PHONE,CONTACT_NAME,SCORE,IS_CARE,
             IS_O2O,IS_DELIVERY_CODECHAIN_GOODS,IS_SHELVE,WORK_TIME,DELIVERY_TIME,TRANSPORT_TYPE,RETURN_ADDRESS')
-            ->where(['GUID' => $GUID])
-            ->asArray()
-            ->one();
+            ->where(['GUID' => $GUID]);
 
-        return $query;
+        return new ActiveDataProvider([
+            'query' => $query->asArray(),
+            'pagination' => [
+                'pageSize' => PAGE_SIZE
+            ],
+        ]);
     }
     //获取门店(权限下的)
     public function GetBranch($GUID, $SUPPROVINCE_GUID)