门店详情修改

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

backend/controllers/v1/branch/BranchController.php

@@ -100,37 +100,27 @@ class BranchController extends BaseController
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
             $info = $model->BranchDetail($params['GUID']);
-            if (!$list = $info->getModels()) {
+            if (!$info) {
                 throw new BadRequestHttpException('未找到符合的门店列表信息');
             }
-            //获取门店服务类目信息
+            //获取门店服务类目关系信息
             $branch_service_relation = $branch_service->BranchSeviceRelation($params['GUID']);
-            if($bsr = $branch_service_relation->getModels()){
-                foreach($bsr as $k => $v){
+            //获取门店服务类目名称
+            if($branch_service_relation){
+                foreach($branch_service_relation as $k => $v){
                     $branch_s_type =  $branch_service_type->BranchServiceInfo('','',$v['SERVICE_TYPE_GUID']);
                     $branch_ser_type = $branch_s_type->getModels();
                     foreach($branch_ser_type as $kk => $vv){
-                        $bsr[$k]['BRANCH_SERVICE_TYPE_NAME'] = $vv['NAME'];
-                    }
-                }
+                        $branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = $vv['NAME'];
                     }
-            $branch_service_relation->setModels($bsr);
-            //将服务类目信息添加到门店信息
-            foreach($list as $key => $val){
-                if($bsr_info = $branch_service_relation->getModels()){
-                    foreach($bsr_info as $k => $v){
-                        $list[$key]['BRANCH_SERVICE_INFO'][] = $v;
-                    }
-                }else{
-                    $list[$key]['BRANCH_SERVICE_INFO'] = '';
                 }
             }
-            $info->setModels($list);
+            $info['BRANCH_SERVICE_TYPE'] = $branch_service_relation;
             return $info;
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
-            $errors = $model->errors;
-            return $errors;
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
     }
 

backend/models/v1/branch/ShopBranch.php

@@ -120,7 +120,7 @@ class ShopBranch extends BaseModel
             [['SUPPORT_SEND_PLATFORM'], 'string', 'max' => 10],
             [['HY_CODE', 'STATUS', 'BRANCH_NAME'], 'string', 'max' => 30],
             [['COMP_TEXT', 'SALESDIST_TEXT', 'ZCBZIRK_TEXT'], 'string', 'max' => 200],
-            [['GUID'], 'unique'],
+            [['GUID'], 'unique','on'=>['create']],
 
             [['CODE','DESCRIPTION','CONTACT_NAME','PHONE','NAME','LAT','LNG','IS_DELIVERY','DELIVERY_TIME','WORK_TIME','IS_CARE','IS_RESERV',
                 'IS_O2O','IS_BOIL_MEDICINE','IS_POINTS_SHOP','IS_VIRTUAL_BRANCH','IS_DELIVERY_CODECHAIN_GOODS','IS_SHELVE',
@@ -330,18 +330,10 @@ 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]);
+            ->where(['GUID'=>$GUID])
+            ->asArray()
+            ->one();
 
-        return new ActiveDataProvider([
-            'query' => $query->asArray(),
-            'pagination' => [
-                'pageSize' => 10
-            ],
-            'sort' => [
-                'attributes' => [
-                    'CODE' => SORT_DESC
-                ]
-            ]
-        ]);    
+        return $query;
     }
 }

backend/models/v1/branch/ShopBranchService.php

@@ -35,7 +35,7 @@ class ShopBranchService extends BaseModel
             [['STATE'], 'integer'],
             [['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID'], 'string', 'max' => 50],
             [['ORDER_INDEX'], 'string', 'max' => 5],
-            [['GUID'], 'unique'],
+            [['GUID'], 'unique','on'=>['create']],
         ];
     }
 
@@ -64,16 +64,11 @@ class ShopBranchService extends BaseModel
         $branch_service = static::find()
             ->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID')
             ->where(['STATE'=>1])
-            ->andwhere(['BRANCH_GUID'=>$b_guid]);
+            ->andwhere(['BRANCH_GUID'=>$b_guid])
+            ->asArray()
+            ->all();
             
-        return new ActiveDataProvider(
-            [
-                'query' => $branch_service->asArray(),
-                'pagination' => [
-                    'pageSize' =>  15,
-                ]
-            ]
-        );
+        return $branch_service;
     }
     
 }
\ No newline at end of file