Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

ee1a7914 · 孙磊 · 65cfa17e · 675198e7 · ee1a7914 · ee1a7914
Commit ee1a7914 authored Dec 30, 2019 by 孙磊
11 changed files
--- a/backend/controllers/v1/authority/AuthorityNodeController.php
+++ b/backend/controllers/v1/authority/AuthorityNodeController.php
@@ -10,6 +10,7 @@ use yii\web\HttpException;
 use yii\web\ServerErrorHttpException;
 use app\models\v1\rbacuser\ShopRbacRoleAccess;
 use app\models\v1\rbacuser\ShopRbacRole;
+use yii\data\ActiveDataProvider;
 class AuthorityNodeController extends BaseController
 {
@@ -88,6 +89,10 @@ class AuthorityNodeController extends BaseController
     *                  PID:父级菜单ID,
     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作),
     *                  "),
+     *     @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -100,16 +105,18 @@ class AuthorityNodeController extends BaseController
            Yii::$app->response->statusCode = 422;
            return $model->erros;
        }
-        $data = $model->nodeList($params);
+        $dataProvider = $model->nodeList($params);
-        if (!$data) {
+        $listArray = $dataProvider->getModels();
+        if (!$listArray) {
            throw new BadRequestHttpException('没有您需要的数据');
        }
        //如果有查询参数则直接返回查询数据，不需要对数据进行处理
        if (!empty($params)) {
-            return $data;
+            return $dataProvider;
        }
-        $list = $this->generateTree($data);
+        $list = $this->generateTree($listArray);
-        return $list;
+        $dataProvider->setModels($list);
+        return $dataProvider;
    }
    /**
@@ -191,6 +198,10 @@ class AuthorityNodeController extends BaseController
     *         response=200,
     *         description="删除成功！"
     *     ),
+     *    @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，删除失败",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -200,7 +211,7 @@ class AuthorityNodeController extends BaseController
        $model = new $this->modelClass();
        $_model = $model::findOne($id);
        if (!$_model) {
-            throw new BadRequestHttpException('Requested resource does not exist !');
+            throw new BadRequestHttpException('不存在的节点！');
        }
        if (!$_model->delete()) {
            throw new ServerErrorHttpException('删除失败！');
@@ -239,6 +250,10 @@ class AuthorityNodeController extends BaseController
     *                  PID:父级菜单ID,
     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="不存在此节点",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -246,11 +261,15 @@ class AuthorityNodeController extends BaseController
    {
        $id = Yii::$app->request->get('ID');
        $model = new $this->modelClass();
-        $info = $model->findOne($id);
+        $info[] = $model->findOne($id)->toArray();
        if (!$info) {
-            throw new BadRequestHttpException('Requested resource does not exist !');
+            throw new BadRequestHttpException('不存在的节点！');
        }
-        return $info;
+        return new ActiveDataProvider([
+            'models' => $info,
+            'pagination' => false
+        ]);
    }
    /**
@@ -283,6 +302,10 @@ class AuthorityNodeController extends BaseController
     *         )
     *     ),
     *     @OA\Response(response=200,description="更新成功！"),
+     *     @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -296,7 +319,7 @@ class AuthorityNodeController extends BaseController
        }
        //过滤掉部分为空的参数
        foreach ($params as $key => $value) {
-            if (in_array($key, ['TITLE', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'SORT', 'PID', 'LEVEL']) && empty(trim($value))) {
+            if (in_array($key, ['TITLE', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'SORT', 'PID', 'LEVEL']) && (empty(trim($value)) && $value != '0')) {
                unset($params[$key]);
            }
        }

--- a/backend/controllers/v1/branch/BranchScoreController.php
+++ b/backend/controllers/v1/branch/BranchScoreController.php
@@ -44,6 +44,14 @@ class BranchScoreController extends BaseController
     *                ARTIFICIAL_NUMBER:导入员工,
     *                ARTIFICIAL_NAME:导入员工姓名,
     *                UPDATE_TIME:更新时间"),
+     *   @OA\Response(
+     *         response=400,
+     *         description="未找到符合条件的数据",
+     *     ),
+     *   @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *   security={{"Authorization":{}}}
     * )
     */
@@ -90,6 +98,14 @@ class BranchScoreController extends BaseController
     *                STORE_CONFIGURATION:门店配置分数,
     *                ARTIFICIAL_NUMBER:导入员工,
     *                ARTIFICIAL_NAME:导入员工姓名"),
+     *   @OA\Response(
+     *         response=400,
+     *         description="不存在的打分详情",
+     *     ),
+     *   @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *   security={{"Authorization":{}}}
     * )
     */
@@ -103,11 +119,11 @@ class BranchScoreController extends BaseController
            return $model->errors;
        }
-        $info = $model->soreInfo($id);
+        $dataProvider = $model->soreInfo($id);
-        if (!$info) {
+        if (!$dataProvider->getModels()) {
            throw new BadRequestHttpException('请求有误，不存在该评分！');
        }
-        return $info;
+        return $dataProvider;
    }
    /**
@@ -156,6 +172,14 @@ class BranchScoreController extends BaseController
     *         response=200,
     *         description="更新成功！"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="不存在的服务打分",
+     *     ),
+     *     @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */
@@ -164,18 +188,15 @@ class BranchScoreController extends BaseController
        $params = Yii::$app->request->bodyParams;
        $model = ShopBranchScore::findOne($params['GUID']);
        if (!$model) {
-            throw new BadRequestHttpException('Requested resource does not exist !');
+            throw new BadRequestHttpException('不存在的服务打分');
        }
        $model->scenario = 'update';
        $model->attributes = $params;
-        if (!$model->validate()) {
-            Yii::$app->response->statusCode = 422;
-            return $model->errors;
-        }
        $model->UPDATE_TIME = date('Y-m-d H:i:s', time());
-        if (!$model->save(false)) {
+        if (!$model->save()) {
-            throw new ServerErrorHttpException('更新失败！');
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
        }
        throw new HttpException(200, "更新成功！");
@@ -200,6 +221,14 @@ class BranchScoreController extends BaseController
     *         response=200,
     *         description="删除成功！"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="不存在的门店服务打分",
+     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，删除失败",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */
@@ -208,7 +237,7 @@ class BranchScoreController extends BaseController
        $guid = Yii::$app->request->get('GUID');
        $model = ShopBranchScore::findOne($guid);
        if (!$model) {
-            throw new BadRequestHttpException("Requested resource does not exist !");
+            throw new BadRequestHttpException("不存在的门店服务打分");
        }
        if (!$model->delete()) {
@@ -264,6 +293,14 @@ class BranchScoreController extends BaseController
     *         response=200,
     *         description="OK,保存成功"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="门店编号不正确，或不存在",
+     *     ),
+     *     @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -281,14 +318,11 @@ class BranchScoreController extends BaseController
        $model->BRANCH_NAME = $info['NAME'];
        $model->GUID = Func::create_guid();
-        if (!$model->validate()) {
-            Yii::$app->response->statusCode = 422;
-            return $model->errors;
-        }
        $model->UPDATE_TIME = date('Y-m-d H:i:s', time());
-        if (!$model->save(false)) {
+        if (!$model->save()) {
-            throw new ServerErrorHttpException('保存失败！');
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
        }
        throw new HttpException(200, "保存成功！");
@@ -354,9 +388,17 @@ class BranchScoreController extends BaseController
     *         description="导入成功",
     *     ),
     *     @OA\Response(
+     *         response=400,
+     *         description="导入失败",
+     *     ),
+     *     @OA\Response(
     *         response=422,
     *         description="导入失败，数据验证错误，返回错误数据行号及错误信息（数组）。",
     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，导入失败",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */

--- a/backend/controllers/v1/common/ShopTransportAreaController.php
+++ b/backend/controllers/v1/common/ShopTransportAreaController.php
@@ -64,13 +64,17 @@ class ShopTransportAreaController extends BaseController
    public function actionProvincesCity()
    {
        $model = new $this->modelClass();
-        $areaArr = $model::find()
+        $query = $model::find()
            ->select('GUID,NAME,PARENT_GUID')
            ->where(['or', ['like', 'PARENT_GUID', 'P'], ['PARENT_GUID' => '']])
            ->andWhere(['!=', 'GUID', 'P0'])
-            ->orderBy('PARENT_GUID ASC')
+            ->orderBy('PARENT_GUID ASC');
-            ->asArray()->all();
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query->asArray(),
+            'pagination' => false
+        ]);
+        $areaArr = $dataProvider->getModels();
        $areaInfo = [];
        foreach ($areaArr as $key => $value) {
            if (empty(trim($value['PARENT_GUID']))) {
@@ -79,6 +83,7 @@ class ShopTransportAreaController extends BaseController
            }
            $areaInfo[$value['PARENT_GUID']]['CITY'][] = $value;
        }
-        return $areaInfo;
+        $dataProvider->setModels($areaInfo);
+        return $dataProvider;
    }
 }
--- a/backend/controllers/v1/shopgoods/GoodsDetailSettingController.php
+++ b/backend/controllers/v1/shopgoods/GoodsDetailSettingController.php
@@ -7,6 +7,7 @@ use Yii;
 use backend\controllers\v1\BaseController;
 use backend\helpers\UploadFiles;
 use yidas\phpSpreadsheet\Helper;
+use yii\data\ActiveDataProvider;
 use yii\web\BadRequestHttpException;
 use yii\web\HttpException;
 use yii\web\ServerErrorHttpException;
@@ -34,6 +35,10 @@ class GoodsDetailSettingController extends BaseController
     *                              STATUS:状态,1:启用，0:禁用,
     *                              START_TIME:生效开始时间,
     *                              END_TIME:生效结束时间"),
+     *    @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *    security={{"Authorization": {}}}
     * )
     */
@@ -63,16 +68,11 @@ class GoodsDetailSettingController extends BaseController
     *     @OA\Response(response=200,description="
     *                          GUID:模板GUID,
     *                          NAME:版式名称,
-     *                          NUM:已关联商品（个）,
     *                          STATUS:状态,1:启用，0:禁用,
     *                          START_TIME:生效开始时间,
     *                          END_TIME:生效结束时间,
     *                          HEAD_PIC_URL:顶部内容,
     *                          FOOT_PIC_URL:底部内容"),
-     *     @OA\Response(
-     *         response=422,
-     *         description="数据验证错误，错误信息（数组）。",
-     *     ),
     *     security={{"Authorization": {}}}
     * )
     */
@@ -80,11 +80,15 @@ class GoodsDetailSettingController extends BaseController
    {
        $guid = Yii::$app->request->get('GUID');
        $model = new $this->modelClass();
-        $info = $model::findOne($guid);
+        $info[] = $model::findOne($guid)->toArray();
        if (!$info) {
            throw new BadRequestHttpException('不存在该模板！');
        }
-        return $info;
+        return new ActiveDataProvider([
+            'models' => $info,
+            'pagination' => false
+        ]);
    }
    /**
@@ -221,6 +225,14 @@ class GoodsDetailSettingController extends BaseController
     *         response=200,
     *         description="删除成功！"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="请求的商品详情页模板不存在",
+     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */
@@ -230,7 +242,7 @@ class GoodsDetailSettingController extends BaseController
        $model = new $this->modelClass();
        $_model = $model::findOne($guid);
        if (!$_model) {
-            throw new BadRequestHttpException('该模板不存在');
+            throw new BadRequestHttpException('该商品详情页模板不存在');
        }
        if (!$_model->delete()) {
            throw new ServerErrorHttpException('删除失败！');
@@ -252,6 +264,10 @@ class GoodsDetailSettingController extends BaseController
     *                          NAME:商品名称,
     *                          CODE:商品编码,
     *                          MAIN_IMAGE_PATH:商品主图"),
+     *    @OA\Response(
+     *         response=400,
+     *         description="没有符合条件的数据",
+     *     ),
     *     security={{"Authorization": {}}}
     * )
     */
@@ -287,6 +303,10 @@ class GoodsDetailSettingController extends BaseController
     *         response=200,
     *         description="添加成功"
     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，添加失败",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */
@@ -320,6 +340,10 @@ class GoodsDetailSettingController extends BaseController
     *         response=200,
     *         description="删除成功！"
     *     ),
+     *    @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，删除失败",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */

--- a/backend/controllers/v1/shopuser/ShopEmployeeController.php
+++ b/backend/controllers/v1/shopuser/ShopEmployeeController.php
@@ -86,7 +86,7 @@ class ShopEmployeeController extends BaseController
        }
        $data = $model->employeeInfo($id);
-        if (!$data) {
+        if (!$data->getModels()) {
            throw new BadRequestHttpException('请求错误，该员工不存在');
        }
        return $data;
@@ -312,7 +312,7 @@ class ShopEmployeeController extends BaseController
        $params = Yii::$app->request->bodyParams;
        //过滤掉部分为空的参数
        foreach ($params as $key => $value) {
-            if (in_array($key, ['EMPLOYEE_CODE', 'CONTACTBIRTH_DATE', 'IS_DISTRIBUTOR', 'EMPLOYEE_IS_MANAGER', 'PASSWORD']) && empty(trim($value))) {
+            if (in_array($key, ['EMPLOYEE_CODE', 'CONTACTBIRTH_DATE', 'IS_DISTRIBUTOR', 'EMPLOYEE_IS_MANAGER', 'PASSWORD']) && (empty(trim($value)) && $value != '0')) {
                unset($params[$key]);
            }
        }

--- a/backend/controllers/v1/transport/CompanyController.php
+++ b/backend/controllers/v1/transport/CompanyController.php
@@ -6,8 +6,7 @@ use Yii;
 use backend\controllers\v1\BaseController;
 use backend\helpers\Func;
 use yii\data\ActiveDataProvider;
-use yii\web\BadRequestHttpException;
+use yii\web\HttpException;
-use yii\web\ServerErrorHttpException;
 class CompanyController extends BaseController
 {
@@ -30,6 +29,8 @@ class CompanyController extends BaseController
     *           DESCRIPTION:描述,
     *           IS_DEFAULT:是否默认 1是0否
     *      "),
+     *     @OA\Response(response = 403,description = "权限错误"),
+     *     @OA\Response(response = 500,description = "系统错误"),
     *     security={{"Authorization": {}}}
     * )
     */
@@ -64,6 +65,8 @@ class CompanyController extends BaseController
     *           DESCRIPTION:描述,
     *           IS_DEFAULT:是否默认 1是0否
     *      "),
+     *     @OA\Response(response = 403,description = "权限错误"),
+     *     @OA\Response(response = 500,description = "系统错误"),
     *     security={{"Authorization": {}}}
     * )
     */
@@ -71,8 +74,13 @@ class CompanyController extends BaseController
    public function actionCompanyDetail()
    {
        $guid = Yii::$app->request->getQueryparam('guid');
-        $model = $this->modelClass::findOne($guid);
+        $result = $this->modelClass::findOne($guid)->toArray();
-        return $model;
+        return new ActiveDataProvider(
+            [
+                'models' => $result,
+                'pagination' =>false
+            ]
+        );
    }
     /**
@@ -95,7 +103,10 @@ class CompanyController extends BaseController
     *           )
     *       )
     *     ),
-     *     @OA\Response(response=201,description="success"),
+     *     @OA\Response(response=201,description="添加成功"),
+     *     @OA\Response(response = 403,description = "权限错误"),
+     *     @OA\Response(response = 422,description = "数据验证未通过"),
+     *     @OA\Response(response = 500,description = "系统错误"),
     *     security={{"Authorization": {}}}    
     * )
     */
@@ -105,17 +116,16 @@ class CompanyController extends BaseController
        $model->scenario = 'create';//创建的场景
        $other_param = array(
            'GUID'=>Func::create_guid(),
-            'ORG_GUID'=>'100',//Yii::$app->user->identity->ORG_GUID,
+            'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
        );
        $model->setAttributes($other_param);
        $model->setAttributes(Yii::$app->request->getBodyparams());
        if ($model->save()) {
-            Yii::$app->getResponse()->setStatusCode(201);
+            throw new HttpException(201,'添加成功');
        } elseif (!$model->hasErrors()) {
-            throw new ServerErrorHttpException('Failed to create the object for unknown reason.');
+            throw new HttpException(500,'添加失败');
        }
-        return $model;
    }
     /**
@@ -139,26 +149,29 @@ class CompanyController extends BaseController
     *           )
     *       )
     *     ),
-     *     @OA\Response(response=200,description="success"),
+     *     @OA\Response(response = 200,description = "修改成功"),
+     *     @OA\Response(response = 400,description = "失败的请求"),
+     *     @OA\Response(response = 403,description = "权限错误"),
+     *     @OA\Response(response = 422,description = "数据验证未通过"),
+     *     @OA\Response(response = 500,description = "系统错误"),
     *     security={{"Authorization": {}}}    
     * )
     */
    public function actionCompanyRevise()
    {
        $guid = Yii::$app->request->getBodyparam('GUID');
-        // var_dump($guid);die;
        $model = $this->modelClass::findOne($guid);
        if(!$model){
-            throw new BadRequestHttpException('没有找到记录');
+            throw new HttpException(400,'记录不存在');
        }
        $model->scenario = 'update';//创建的场景
        $model->setAttributes(Yii::$app->request->getBodyparams());
        if ($model->save() === false && !$model->hasErrors()) {
-            throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
+            throw new HttpException(500,'修改失败');
        }
-        return $model;
+        throw new HttpException(200,'修改成功');
    }
     /**
@@ -177,7 +190,10 @@ class CompanyController extends BaseController
     *           )
     *       )
     *     ),
-     *     @OA\Response(response=204,description="success"),
+     *     @OA\Response(response = 204,description = "删除成功"),
+     *     @OA\Response(response = 400,description = "失败的请求"),
+     *     @OA\Response(response = 403,description = "权限错误"),
+     *     @OA\Response(response = 500,description = "系统错误"),
     *     security={{"Authorization": {}}}    
     * )
     */
@@ -186,13 +202,13 @@ class CompanyController extends BaseController
        $guid = Yii::$app->request->getBodyparam('GUID');
        $model = $this->modelClass::findOne($guid);
        if(!$model){
-            throw new BadRequestHttpException('没有找到记录');
+            throw new HttpException(400,'记录不存在');
        }else if ($model->delete() === false) {
-            throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
+            throw new HttpException(500,'删除失败');
        }
        Yii::$app->getResponse()->setStatusCode(204);
-        return $model;
+        return null;
    }
 }
\ No newline at end of file
--- a/backend/controllers/v1/transport/TransportSettingController.php
+++ b/backend/controllers/v1/transport/TransportSettingController.php
@@ -3,7 +3,6 @@
 namespace backend\controllers\v1\transport;
 use app\models\v1\branch\ShopBranch;
-use app\models\v1\common\ShopTransportArea;
 use app\models\v1\rbacuser\ShopRbacUser;
 use app\models\v1\transport\ShopPackagingcostsBranches;
 use backend\controllers\v1\BaseController;
@@ -37,23 +36,31 @@ class TransportSettingController extends BaseController
     *                INCREASE_WEIGHT_FEE:续重费用,
     *                IS_USED:是否启用,
     *                SELECT_AREA:配送城市"),
+     *   @OA\Response(
+     *         response=400,
+     *         description="没有符合条件的数据",
+     *     ),
+     *   @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *   security={{"Authorization":{}}}
     * )
     */
    public function actionTransportTemplates()
    {
-        $platform_type = Yii::$app->request->get('PLATFORM_TYPE');
+        $platformType = Yii::$app->request->get('PLATFORM_TYPE');
-        if (empty($platform_type)) {
+        if (empty($platformType)) {
-            $platform_type = 'shop';  //默认取微商城的运费模板
+            $platformType = 'shop';  //默认取微商城的运费模板
        }
        $model = new $this->modelClass();
-        $model->PLATFORM_TYPE = $platform_type;
+        $model->PLATFORM_TYPE = $platformType;
        if (!$model->validate()) {
            Yii::$app->response->statusCode = 422;
            return $model->errors;
        }
-        $list = $model->templates($platform_type);
+        $list = $model->templates($platformType);
        if (!$list->getModels()) {
            throw new BadRequestHttpException('未找到符合条件的数据');
        }
@@ -84,8 +91,11 @@ class TransportSettingController extends BaseController
     *                BRANCHES_INFO：指定省级列表
     *                      GUID：指定省级guid,
     *                      CODE：门店编码,
-     *                      NAME：门店名称,
+     *                      NAME：门店名称"),
-     *                IS_PERMIT:是否准许编辑（0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级）"),
+     *   @OA\Response(
+     *         response=422,
+     *         description="不存在的运费模板",
+     *     ),
     *   security={{"Authorization":{}}}
     * )
     */
@@ -97,30 +107,16 @@ class TransportSettingController extends BaseController
            Yii::$app->response->statusCode = 422;
            return $model->errors;
        }
-        $info = $model->details($model->GUID);
+        $dataProvider = $model->details($model->GUID);
+        $info = $dataProvider->getModels();
        if (!$info) {
-            throw new BadRequestHttpException('请求信息不存在');
+            throw new BadRequestHttpException('不存在的运费模板');
        }
-        // $info['SELECT_AREA'] = trim($info['SELECT_AREA']) ? explode(',', $info['SELECT_AREA']) : [];
-        // $info['PROVINCES'] = (new ShopTransportArea)->getProvinces($info['SELECT_AREA']);
-        // $info['LIMIT_MEMBER_GROUP_GUID'] = trim($info['LIMIT_MEMBER_GROUP_GUID']) ? explode(',', $info['LIMIT_MEMBER_GROUP_GUID']) : [];
        $transportBranches = (new ShopPackagingcostsBranches)->transportBranches($model->GUID);
-        $info['BRANCHES_INFO'] = $transportBranches;  //指定省级
+        $info[0]['BRANCHES_INFO'] = $transportBranches;  //指定省级
+        $dataProvider->setModels($info);
-        //权限
+        return $dataProvider;
-        $permit = 1;
-        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        //总部权限管理员,分部管理员权限。非权限内不可保存编辑
-        if (!in_array($userInfo['BRANCH_TYPE'], [BRANCH_TYPE_HEADQUARTERS, BRANCH_TYPE_REGION])) {
-            $permit = 0;
-        }
-        //分部管理员权限2,
-        if ($userInfo['BRANCH_GUID'] == BRANCH_TYPE_REGION && $userInfo['PARENT_BRANCH_GUID'] == $info['GROUP_GUID']) {
-            $permit = 2;
-        }
-        $info['IS_PERMIT'] = $permit;  //是否准许编辑保存，0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级
-        return $info;
    }
    /**
@@ -161,6 +157,10 @@ class TransportSettingController extends BaseController
     *         response=422,
     *         description="数据验证错误，错误信息（数组）。",
     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */
@@ -168,25 +168,21 @@ class TransportSettingController extends BaseController
    {
        $params = Yii::$app->request->bodyParams;
        $model = new $this->modelClass();
-        $model->scenario = 'update';
        $_model = $model::findOne($params['GUID']);
        if (!$_model) {
-            throw new BadRequestHttpException('Requested resource does not exist !');
+            throw new BadRequestHttpException('不存在的运费模板！');
        }
+        $_model->scenario = 'update';
+        $_model->attributes = $params;
        //验证权限
        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        //非总部和省级管理员不可修改
+        $_model->BRANCH_TYPE = $userInfo['BRANCH_TYPE'];
-        if (!in_array($userInfo['BRANCH_TYPE'], [BRANCH_TYPE_HEADQUARTERS, BRANCH_TYPE_REGION])) {
+        if (!$_model->validate()) {
-            throw new BadRequestHttpException('没有修改权限！');
+            Yii::$app->response->statusCode = 422;
-        }
+            return $_model->errors;
-        //分部管理员权限,（当同为省级，非管理员所属省级不可编辑；属于上级创建可编辑）
-        if ($userInfo['BRANCH_TYPE'] == BRANCH_TYPE_REGION && ($userInfo['BRANCH_GUID'] != $_model['GROUP_GUID']) && ($userInfo['PARENT_BRANCH_GUID'] != $_model['GROUP_GUID'])) {
-            throw new BadRequestHttpException('没有修改权限！');
        }
-        $_model->attributes = $params;
        //删除条件：总部权限删除所有，省级只能删除自己。
        switch ($userInfo['BRANCH_TYPE']) {
            case BRANCH_TYPE_HEADQUARTERS:
@@ -229,7 +225,7 @@ class TransportSettingController extends BaseController
        //如果是总部创建的模板下级不能修改shop_transport_setting 数据
        if (!($userInfo['BRANCH_TYPE'] == BRANCH_TYPE_REGION && $userInfo['PARENT_BRANCH_GUID'] == $_model['GROUP_GUID'])) {
-            if (!$_model->save()) {
+            if (!$_model->save(false)) {
                Yii::$app->response->statusCode = 422;
                return $_model->errors;
            }
@@ -252,6 +248,14 @@ class TransportSettingController extends BaseController
     *                RECIVER_PROVINCE:所在省,
     *                RECIVER_CITY:所在市,
     *                RECIVER_REGION:所在区"),
+     *   @OA\Response(
+     *         response=400,
+     *         description="没有符合条件的数据",
+     *     ),
+     *   @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
     *   security={{"Authorization":{}}}
     * )
     */
@@ -291,6 +295,14 @@ class TransportSettingController extends BaseController
     *         response=200,
     *         description="删除成功！"
     *     ),
+     *     @OA\Response(
+     *         response=400,
+     *         description="运费模板不存在，或禁止的操作",
+     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误，删除失败",
+     *     ),
     *     security={{"Authorization":{}}},
     * )
     */
@@ -300,7 +312,7 @@ class TransportSettingController extends BaseController
        $model = new $this->modelClass();
        $_model = $model::findOne($guid);
        if (!$_model) {
-            throw new BadRequestHttpException("Requested resource does not exist !");
+            throw new BadRequestHttpException("不存在的运费模板！");
        }
        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
@@ -347,6 +359,14 @@ class TransportSettingController extends BaseController
     *         response=200,
     *         description="OK,保存成功"
     *     ),
+     *    @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
+     *     @OA\Response(
+     *         response=500,
+     *         description="服务器内部错误",
+     *     ),
     *     security={{"Authorization":{}}}
     * )
     */

--- a/backend/models/v1/branch/ShopBranchScore.php
+++ b/backend/models/v1/branch/ShopBranchScore.php
@@ -99,7 +99,7 @@ class ShopBranchScore extends BaseModel
        $where = [];
        switch ($userInfo['BRANCH_TYPE']) {
            case BRANCH_TYPE_REGION:  //省级
-                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID'],'CODE');
+                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID'], 'CODE');
                $branches[] = $userInfo['BRANCH_CODE'];
                $where = ['sbs.BRANCH_CODE' => $branches];
                break;
@@ -144,12 +144,14 @@ class ShopBranchScore extends BaseModel
     */
    public function soreInfo($id)
    {
-        $info = static::find()
+        $query = static::find()
            ->select('GUID,BRANCH_NAME,BRANCH_CODE,BASIC_SERVICES,QUALITY_ASSURANCE,OPERATION_MANAGEMENT,STORE_IMAGE,ELECTRICITY_MANAGEMENT,CUSTOMERE_VALUATION,STORE_CONFIGURATION,ARTIFICIAL_NUMBER,ARTIFICIAL_NAME')
-            ->where(['GUID' => $id])
+            ->where(['GUID' => $id]);
-            ->one();
-        return $info;
+        return new ActiveDataProvider([
+            'query' => $query->asArray(),
+            'pagination' => false
+        ]);
    }
    /**
@@ -179,7 +181,7 @@ class ShopBranchScore extends BaseModel
        $where = [];
        switch ($userInfo['BRANCH_TYPE']) {
            case BRANCH_TYPE_REGION:  //省级
-                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID'],'CODE');
+                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID'], 'CODE');
                $branches[] = $userInfo['BRANCH_CODE'];
                $where = ['sbs.BRANCH_CODE' => $branches];
                break;
@@ -229,5 +231,4 @@ class ShopBranchScore extends BaseModel
        }
        return $row_list;
    }
 }
--- a/backend/models/v1/rbacuser/ShopRbacNode.php
+++ b/backend/models/v1/rbacuser/ShopRbacNode.php
@@ -4,6 +4,7 @@ namespace app\models\v1\rbacuser;
 use Yii;
 use app\models\v1\BaseModel;
+use yii\data\ActiveDataProvider;
 /**
 * This is the model class for table "shop_rbac_node".
@@ -93,8 +94,8 @@ class ShopRbacNode extends  BaseModel
    {
        $query = static::find()
            ->select(['ID', 'NAME', 'TITLE', 'ICON', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'REMARK', 'SORT', 'PID', 'LEVEL'])
-            ->orderBy("SORT ASC")
+            ->orderBy("SORT ASC");
-            ->asArray();
        if (isset($params['TITLE'])) {
            $query->andFilterWhere(['like', 'TITLE', $params['TITLE']]);
        }
@@ -102,6 +103,12 @@ class ShopRbacNode extends  BaseModel
        if (isset($params['STATUS'])) {
            $query->andFilterWhere(['STATUS' => $params['STATUS']]);
        }
-        return $query->all();
+        return new ActiveDataProvider(
+            [
+                'query' => $query->asArray(),
+                'pagination' => false
+            ]
+        );
    }
 }
--- a/backend/models/v1/shopuser/ShopEmployee.php
+++ b/backend/models/v1/shopuser/ShopEmployee.php
@@ -153,11 +153,16 @@ class ShopEmployee extends ShopUser
     */
    public function employeeInfo($id)
    {
-        $info = static::find()->alias('su')
+        $query = static::find()->alias('su')
            ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.CONTACTBIRTH_DATE,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as BRANCH_CODE')
            ->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
-            ->where(['su.GUID' => $id, 'su.BELONG' => 1])
+            ->where(['su.GUID' => $id, 'su.BELONG' => 1]);
-            ->one();
-        return $info;
+        return new ActiveDataProvider(
+            [
+                'query' => $query,
+                'pagination' => false
+            ]
+        );
    }
 }
--- a/backend/models/v1/transport/TransportSetting.php
+++ b/backend/models/v1/transport/TransportSetting.php
@@ -29,6 +29,7 @@ use yii\data\ActiveDataProvider;
 */
 class TransportSetting extends \app\models\v1\BaseModel
 {
+    public $BRANCH_TYPE;  //登录用户绑定门店类型
    /**
     * {@inheritdoc}
     */
@@ -53,6 +54,7 @@ class TransportSetting extends \app\models\v1\BaseModel
            [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'BASE_WEIGHT', 'INCREASE_WEIGHT'], 'default', 'value' => 0, 'on' => ['creation', 'update']],
            ['IS_USED', 'default', 'value' => 1, 'on' => ['creation', 'update']],
            ['PLATFORM_TYPE', 'default', 'value' => 'shop', 'on' => 'creation'],
+            ['BRANCH_TYPE', 'vilidateBranchType', 'on' => 'update'],
        ];
    }
@@ -81,6 +83,28 @@ class TransportSetting extends \app\models\v1\BaseModel
        ];
    }
+    /**
+     * 验证修改权限
+     */
+    public function vilidateBranchType()
+    {
+        $allowed = 1;
+        //验证权限
+        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
+        //非总部和省级管理员不可修改
+        if (!in_array($this->BRANCH_TYPE, [BRANCH_TYPE_HEADQUARTERS, BRANCH_TYPE_REGION])) {
+            $allowed = 0;
+        }
+        //分部管理员权限,（当同为省级，非管理员所属省级不可编辑；属于上级创建可编辑）
+        if ($this->BRANCH_TYPE == BRANCH_TYPE_REGION && ($userInfo['BRANCH_GUID'] != $this->GROUP_GUID) && ($userInfo['PARENT_BRANCH_GUID'] != $this->GROUP_GUID)) {
+            $allowed = 0;
+        }
+        if ($allowed == 0) {
+            $this->addError('error', '没有修改权限！');
+        }
+    }
    /**
     * 运费模板列表
     * 
@@ -145,11 +169,13 @@ class TransportSetting extends \app\models\v1\BaseModel
     */
    public function details($guid)
    {
-        $info = static::find()
+        $query = static::find()
            ->select(['GUID', 'TRANSPORT_TYPE', 'BASE_FEE', 'BASE_WEIGHT', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'INCREASE_WEIGHT_FEE', 'DESCRIPTION', 'SELECT_AREA', 'IS_USED', 'LIMIT_MEMBER_GROUP_GUID', 'GROUP_GUID'])
-            ->where(['GUID' => $guid])
+            ->where(['GUID' => $guid]);
-            ->asArray()
-            ->one();
+        return new ActiveDataProvider([
-        return $info;
+            'query' => $query->asArray(),
+            'pagination' => false
+        ]);
    }
 }