获取单条数据修改、状态码规范

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

backend/controllers/v1/authority/AuthorityRoleController.php

@@ -8,6 +8,7 @@ use backend\helpers\Func;
 use yii\web\BadRequestHttpException;
 use yii\web\HttpException;
 use app\models\v1\rbacuser\ShopRbacRoleAccess;
+use yii\data\ActiveDataProvider;
 
 class AuthorityRoleController extends BaseController
 {
@@ -65,11 +66,14 @@ class AuthorityRoleController extends BaseController
 
         if ($model->validate()) {
             //获取角色详情
-            $info = $model->getAuthorityRoles($ID);
-            if (!$info->getModels()) {
-                throw new BadRequestHttpException('未找到符合的权限角色信息');
-            }
-            return $info;
+            $info = $this->modelClass::findOne($ID);
+            if (!$info) throw new HttpException(400, '记录不存在');
+            return new ActiveDataProvider(
+                [
+                    'models' => $info->toArray(),
+                    'pagination' => false
+                ]
+            );
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
             Yii::$app->response->statusCode = 422;
@@ -114,7 +118,7 @@ class AuthorityRoleController extends BaseController
         $model->setAttributes($params);
 
         if ($model->save()) {
-            Yii::$app->getResponse()->setStatusCode(201);
+            return Func::returnResult(201,'添加成功');
         } elseif (!$model->hasErrors()) {
             throw new HttpException(500, '添加失败');
         }
@@ -141,7 +145,7 @@ class AuthorityRoleController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=202,description="修改角色成功"),
+     *     @OA\Response(response=200,description="修改角色成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -164,8 +168,7 @@ class AuthorityRoleController extends BaseController
         if ($model->save() === false && !$model->hasErrors()) {
             throw new HttpException(500, '修改失败');
         }
-        Yii::$app->getResponse()->setStatusCode(202);
-        return $model;
+        return Func::returnResult(200,'修改成功');
     }
     /**
      * @OA\POST(

backend/controllers/v1/branch/BranchController.php

@@ -138,9 +138,7 @@ class BranchController extends BaseController
                 }
             }
             //组合数据
-            foreach ($list as $key => $val) {
-                $list[$key]['BRANCH_SERVICE_TYPE'] = $branchServiceRelation;
-            }
+            $list['BRANCH_SERVICE_TYPE'] = $branchServiceRelation;
             $info->setModels($list);
             return $info;
         } else {
@@ -260,7 +258,7 @@ class BranchController extends BaseController
         $model->setAttributes(Yii::$app->getRequest()->post());
 
         if ($model->save()) {
-            Yii::$app->getResponse()->setStatusCode(201);
+            return Func::returnResult(201,'添加成功');
         } elseif (!$model->hasErrors()) {
             throw new HttpException(500, '添加失败');
         }
@@ -476,7 +474,7 @@ class BranchController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=202,description="门店修改成功"),
+     *     @OA\Response(response=200,description="门店修改成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -545,8 +543,7 @@ class BranchController extends BaseController
         if ($model->save() === false && !$model->hasErrors()) {
             throw new HttpException(500, '修改失败');
         }
-        Yii::$app->getResponse()->setStatusCode(202);
-        return $model;
+        return Func::returnResult(200,'修改成功');
     }
     /**
      * @OA\DELETE(
@@ -564,7 +561,7 @@ class BranchController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=203,description="门店删除成功"),
+     *     @OA\Response(response=204,description="门店删除成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -580,8 +577,7 @@ class BranchController extends BaseController
             throw new HttpException(500, '删除失败');
         }
 
-        Yii::$app->getResponse()->setStatusCode(203);
-        return $branchservice;
+        return Func::returnResult(204,'删除成功');
     }
     /**
      * @OA\Post(

backend/controllers/v1/branch/BranchServiceTypeController.php

@@ -10,7 +10,7 @@ use backend\helpers\UploadFiles;
 use yidas\phpSpreadsheet\Helper;
 use yii\web\HttpException;
 use yii\web\UploadedFile;
-
+use yii\data\ActiveDataProvider;
 
 class BranchServiceTypeController extends BaseController
 {
@@ -66,7 +66,7 @@ class BranchServiceTypeController extends BaseController
      *   tags={"门店&DC"},
      *   description="门店服务类目详情",
      *   summary="门店服务类目详情(孙磊)",
-     *   @OA\Parameter(name="code",in="query",description="门店服务类目编号",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="GUID",in="query",description="门店服务类目GUID",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *           GUID:服务类目GUID,
      *           ORG_GUID:组织机构号,
@@ -83,16 +83,18 @@ class BranchServiceTypeController extends BaseController
     {
         $model = new $this->modelClass();
         //用户输入数据赋值到模型属性
-        $model->CODE = Yii::$app->request->get('code');
+        $GUID = $model->GUID = Yii::$app->request->get('GUID');
 
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
-            $code = $model->CODE;
-            $info = $model->branchServiceInfo($code, '');
-            if (!$info->getModels()) {
-                throw new BadRequestHttpException('未找到符合的门店服务类目信息');
-            }
-            return $info;
+            $info = $this->modelClass::findOne($GUID);
+            if (!$info) throw new HttpException(400, '记录不存在');
+            return new ActiveDataProvider(
+                [
+                    'models' => $info->toArray(),
+                    'pagination' => false
+                ]
+            );
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
             $errors = $model->errors;
@@ -127,8 +129,6 @@ class BranchServiceTypeController extends BaseController
     {
         $model = new $this->modelClass();
         $model->scenario = 'create'; //创建的场景
-        // $datetime = new \DateTime;
-        // $create_time = $datetime->format('Y-m-d H:i:s');
         $create_time = date('Y-m-d H:i:s', time());
         $other_param = array(
             'GUID' => Func::create_guid(),
@@ -140,7 +140,7 @@ class BranchServiceTypeController extends BaseController
         $model->setAttributes(Yii::$app->getRequest()->post());
 
         if ($model->save()) {
-            Yii::$app->getResponse()->setStatusCode(201);
+            return Func::returnResult(201,'添加成功');
         } elseif (!$model->hasErrors()) {
             throw new HttpException(500, '添加失败');
         }
@@ -166,7 +166,7 @@ class BranchServiceTypeController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=202,description="服务类目修改成功"),
+     *     @OA\Response(response=200,description="服务类目修改成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -184,8 +184,7 @@ class BranchServiceTypeController extends BaseController
         if ($model->save() === false && !$model->hasErrors()) {
             throw new HttpException(500, '修改失败');
         }
-        Yii::$app->getResponse()->setStatusCode(202);
-        return $model;
+        return Func::returnResult(200,'修改成功');
     }
     /**
      * @OA\DELETE(
@@ -203,7 +202,7 @@ class BranchServiceTypeController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=203,description="门店服务类目删除成功"),
+     *     @OA\Response(response=204,description="门店服务类目删除成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -218,9 +217,7 @@ class BranchServiceTypeController extends BaseController
         } else if ($branchservice->delete() === false) {
             throw new HttpException(500, '删除失败');
         }
-
-        Yii::$app->getResponse()->setStatusCode(203);
-        return $branchservice;
+        return Func::returnResult(204,'删除成功');        
     }
     /**
      * @OA\Post(

backend/controllers/v1/transport/TransportInitialPriceController.php

@@ -13,6 +13,7 @@ use yii\web\HttpException;
 use app\models\v1\rbacuser\ShopRbacUser;
 use app\models\v1\branch\ShopBranch;
 use app\models\v1\branch\ShopCityDistributionSetting;
+use backend\helpers\Func;
 
 class TransportInitialPriceController extends BaseController
 {
@@ -114,7 +115,7 @@ class TransportInitialPriceController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=202,description="门店起送价修改成功"),
+     *     @OA\Response(response=200,description="门店起送价修改成功"),
      *     @OA\Response(response=500,description = "系统错误"),
      *     security={{"Authorization": {}}}    
      * )
@@ -135,8 +136,7 @@ class TransportInitialPriceController extends BaseController
         if ($model->save() === false && !$model->hasErrors()) {
             throw new HttpException(500, '修改失败');
         }
-        Yii::$app->getResponse()->setStatusCode(202);
-        return $model;
+        return Func::returnResult(200,'修改成功');
     }
     /**
      * @OA\Post(

backend/models/v1/branch/BranchServiceType.php

@@ -37,7 +37,7 @@ class BranchServiceType extends BaseModel
             [['CREATE_TIME'], 'safe'],
             [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
             [['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255],
-            [['GUID'], 'unique'],
+            [['GUID'], 'unique', 'on' => ['create', 'update']],
 
             [['CODE', 'NAME'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
             [['DESCRIPTION'], 'string', 'max' => 100, 'on' => ['import'], 'tooLong' => '最大长度不能超过100'],

backend/models/v1/branch/ShopBranch.php

@@ -355,10 +355,12 @@ 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(),
+            'models' => $query,
             'pagination' => false
         ]);
     }