Skip to content

N
newShopBack
Commit 505e0c82 authored by 侯贺政's avatar 侯贺政
Browse files
Options

数据验证失败，返回信息结构调整。 

Signed-off-by: 侯贺政's avatarhouhezheng <houhezheng@romens.cn>
parent 31034235
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 74 deletions
backend/controllers/v1/authority/AuthorityNodeController.php
View file @ 505e0c82
......@@ -91,7 +91,9 @@ class AuthorityNodeController extends BaseController
* "),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
......@@ -102,8 +104,7 @@ class AuthorityNodeController extends BaseController
$model = new $this->modelClass();
$model->attributes = $params;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->erros;
return $model;
}
$dataProvider = $model->nodeList($params);
$listArray = $dataProvider->getModels();
......@@ -153,8 +154,9 @@ class AuthorityNodeController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="添加失败，数据验证错误，返回错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}}
* )
*/
......@@ -172,8 +174,7 @@ class AuthorityNodeController extends BaseController
}
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(201, '添加成功！');
......@@ -304,8 +305,9 @@ class AuthorityNodeController extends BaseController
* @OA\Response(response=200,description="更新成功！"),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}}
* )
*/
......@@ -326,8 +328,7 @@ class AuthorityNodeController extends BaseController
$_model->attributes = $params;
if (!$_model->save()) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
return Func::returnResult(200, '更新成功！');
......
backend/controllers/v1/branch/BranchScoreController.php
View file @ 505e0c82
......@@ -103,7 +103,9 @@ class BranchScoreController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
......@@ -114,8 +116,7 @@ class BranchScoreController extends BaseController
$model->GUID = $id;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$dataProvider = $model->soreInfo($id);
......@@ -177,7 +178,9 @@ class BranchScoreController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}},
* )
......@@ -194,8 +197,7 @@ class BranchScoreController extends BaseController
$model->UPDATE_TIME = date('Y-m-d H:i:s', time());
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(200, "更新成功！");
......@@ -298,7 +300,9 @@ class BranchScoreController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
......@@ -320,8 +324,7 @@ class BranchScoreController extends BaseController
$model->UPDATE_TIME = date('Y-m-d H:i:s', time());
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(200, "保存成功！");
......@@ -336,6 +339,12 @@ class BranchScoreController extends BaseController
* @OA\Parameter(name="BRANCH_CODE",in="query",description="门店编号",@OA\Schema(type="string")),
* @OA\Parameter(name="ARTIFICIAL_NUMBER",in="query",description="导入人工号",@OA\Schema(type="string")),
* @OA\Response(response="200",description="成功导出门店服务打分列表"),
* @OA\Response(
* response=422,
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
*/
......@@ -346,8 +355,7 @@ class BranchScoreController extends BaseController
$model->attributes = $params;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$list = $model->branchScoreExport($params);
......@@ -407,11 +415,10 @@ class BranchScoreController extends BaseController
$upload_file->uploadFiles = UploadedFile::getInstance($upload_file, 'uploadFile');
$fileInfo = $upload_file->upload();
if ($fileInfo['CODE'] != '200') {
Yii::$app->response->statusCode = 422;
if ($fileInfo['INFO']['uploadFiles'][0] == "类型不对") {
$fileInfo['INFO']['uploadFiles'][0] = '文件类型要求97-2003工作簿 xls格式！';
}
return $fileInfo['INFO'];
throw new BadRequestHttpException($fileInfo['INFO']['uploadFiles'][0]);
}
$data = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(false, ['rowOffset' => 1, 'columns' => 10]);
......
backend/controllers/v1/shopgoods/GoodsDetailSettingController.php
View file @ 505e0c82
......@@ -37,8 +37,9 @@ class GoodsDetailSettingController extends BaseController
* END_TIME:生效结束时间"),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization": {}}}
* )
*/
......@@ -48,8 +49,7 @@ class GoodsDetailSettingController extends BaseController
$model = new $this->modelClass();
$model->attributes = $params;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$list = $model->goodsDetailList($params);
if (!$list->getModels()) {
......@@ -121,8 +121,9 @@ class GoodsDetailSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}},
* )
*/
......@@ -150,8 +151,7 @@ class GoodsDetailSettingController extends BaseController
$_model->attributes = $params;
if (!$_model->save()) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
return Func::returnResult(200, '更新成功');
}
......@@ -185,8 +185,9 @@ class GoodsDetailSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}},
* )
*/
......@@ -200,8 +201,7 @@ class GoodsDetailSettingController extends BaseController
$model->ORG_GUID = $orgGuid;
$model->GUID = str_shuffle(uniqid() . rand(1000, 9999)) . $orgGuid;;
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(201, '创建成功');
}
......@@ -399,11 +399,10 @@ class GoodsDetailSettingController extends BaseController
$upload_file->uploadFiles = UploadedFile::getInstance($upload_file, 'uploadFile');
$fileInfo = $upload_file->upload();
if ($fileInfo['CODE'] != '200') {
Yii::$app->response->statusCode = 422;
if ($fileInfo['INFO']['uploadFiles'][0] == "类型不对") {
$fileInfo['INFO']['uploadFiles'][0] = '文件类型要求97-2003工作簿 xls格式！';
}
return $fileInfo['INFO'];
throw new BadRequestHttpException($fileInfo['INFO']['uploadFiles'][0]);
}
$data = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(true, ['rowOffset' => 2, 'columns' => 2]);
......
backend/controllers/v1/shopuser/ShopEmployeeController.php
View file @ 505e0c82
......@@ -33,6 +33,12 @@ class ShopEmployeeController extends BaseController
* EMPLOYEE_CODE:员工编号,
* MOBILE_PHONE:手机号,
* EMPLOYEE_BRANCH_NAME:用户所属门店"),
* @OA\Response(
* response=422,
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization": {}}}
* )
*/
......@@ -42,8 +48,7 @@ class ShopEmployeeController extends BaseController
$params = Yii::$app->request->queryParams;
$model->attributes = $params;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$list = $model->employeeSearch($params);
......@@ -72,6 +77,12 @@ class ShopEmployeeController extends BaseController
* IS_DISTRIBUTOR:分销商标识（0：否，1：是）,
* EMPLOYEE_IS_MANAGER:员工是否为门店店长,
* BRANCH_CODE:用户所属门店编号"),
* @OA\Response(
* response=422,
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization": {}}}
* )
*/
......@@ -80,8 +91,7 @@ class ShopEmployeeController extends BaseController
$model = new $this->modelClass();
$model->GUID = $id;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$data = $model->employeeInfo($id);
......@@ -116,6 +126,10 @@ class ShopEmployeeController extends BaseController
* description="导入成功",
* ),
* @OA\Response(
* response=400,
* description="导入失败",
* ),
* @OA\Response(
* response=422,
* description="导入失败，数据验证错误，返回错误数据行号及错误信息（数组）。",
* ),
......@@ -129,11 +143,10 @@ class ShopEmployeeController extends BaseController
$upload_file->uploadFiles = UploadedFile::getInstance($upload_file, 'uploadFile');
$fileInfo = $upload_file->upload();
if ($fileInfo['CODE'] != '200') {
Yii::$app->response->statusCode = 422;
if ($fileInfo['INFO']['uploadFiles'][0] == "类型不对") {
$fileInfo['INFO']['uploadFiles'][0] = '文件类型要求97-2003工作簿 xls格式！';
}
return $fileInfo['INFO'];
throw new BadRequestHttpException($fileInfo['INFO']['uploadFiles'][0]);
}
$data = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(true, ['rowOffset' => 2, 'columns' => 9]);
......@@ -231,7 +244,12 @@ class ShopEmployeeController extends BaseController
* )
* ),
* @OA\Response(response=201,description="添加成功！"),
* @OA\Response(response=422,description="数据验证失败，返回错误信息(数组)"),
* @OA\Response(
* response=422,
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
*/
......@@ -267,8 +285,7 @@ class ShopEmployeeController extends BaseController
$model->BELONG = 1;
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(201, '添加成功！');
}
......@@ -302,7 +319,12 @@ class ShopEmployeeController extends BaseController
* )
* ),
* @OA\Response(response=200,description="添加成功！"),
* @OA\Response(response=422,description="数据验证失败，返回错误信息(数组)"),
* @OA\Response(
* response=422,
* description="
* field:验证失败字段
* message:验证失败信息"),
* ),
* security={{"Authorization":{}}}
* )
*/
......@@ -329,8 +351,7 @@ class ShopEmployeeController extends BaseController
$_model->UPDATE_DATE = date('Y-m-d H:i:s', time());
if (!$_model->save()) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
return Func::returnResult(200, '更新成功！');
}
......@@ -374,8 +395,7 @@ class ShopEmployeeController extends BaseController
$_model->UPDATE_NAME = Yii::$app->user->identity->NAME;
$_model->UPDATE_DATE = date('Y-m-d H:i:s', time());
if (!$_model->save(false)) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
return Func::returnResult(204, '删除成功！');
}
......
backend/controllers/v1/transport/TransportSettingController.php
View file @ 505e0c82
......@@ -9,7 +9,6 @@ use backend\controllers\v1\BaseController;
use backend\helpers\Func;
use Yii;
use yii\web\BadRequestHttpException;
use yii\web\HttpException;
use yii\web\ServerErrorHttpException;
class TransportSettingController extends BaseController
......@@ -42,8 +41,9 @@ class TransportSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}}
* )
*/
......@@ -56,8 +56,7 @@ class TransportSettingController extends BaseController
$model = new $this->modelClass();
$model->PLATFORM_TYPE = $platformType;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$list = $model->templates($platformType);
......@@ -94,8 +93,9 @@ class TransportSettingController extends BaseController
* NAME：门店名称"),
* @OA\Response(
* response=422,
* description="不存在的运费模板",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}}
* )
*/
......@@ -104,8 +104,7 @@ class TransportSettingController extends BaseController
$model = new $this->modelClass();
$model->GUID = Yii::$app->request->get('GUID');
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$dataProvider = $model->details($model->GUID);
$info = $dataProvider->getModels();
......@@ -155,8 +154,9 @@ class TransportSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* @OA\Response(
* response=500,
* description="服务器内部错误",
......@@ -179,8 +179,7 @@ class TransportSettingController extends BaseController
$userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
$_model->BRANCH_TYPE = $userInfo['BRANCH_TYPE'];
if (!$_model->validate()) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
//删除条件：总部权限删除所有，省级只能删除自己。
......@@ -226,8 +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(false)) {
Yii::$app->response->statusCode = 422;
return $_model->errors;
return $_model;
}
}
return Func::returnResult(200, "更新成功！");
......@@ -254,8 +252,9 @@ class TransportSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* ),
* description="
* field:验证失败字段
* message:验证失败信息"),
* security={{"Authorization":{}}}
* )
*/
......@@ -266,8 +265,7 @@ class TransportSettingController extends BaseController
$model->scenario = 'search';
$model->attributes = $params;
if (!$model->validate()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
$list = $model->provinceBranches($model->search);
if (!$list->getModels()) {
......@@ -361,7 +359,9 @@ class TransportSettingController extends BaseController
* ),
* @OA\Response(
* response=422,
* description="数据验证错误，错误信息（数组）。",
* description="
* field:验证失败字段
* message:验证失败信息"
* ),
* @OA\Response(
* response=500,
......@@ -413,8 +413,7 @@ class TransportSettingController extends BaseController
}
if (!$model->save()) {
Yii::$app->response->statusCode = 422;
return $model->errors;
return $model;
}
return Func::returnResult(201, "添加成功！");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment