Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
newShopBack
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
newshop
newShopBack
Commits
99fdac0d
Commit
99fdac0d
authored
Dec 30, 2019
by
孙磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
系统提示优化
Signed-off-by:
sunlei
<
sunlei@romens.cn
>
parent
ee1a7914
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
10 deletions
+30
-10
AuthorityRoleController.php
backend/controllers/v1/authority/AuthorityRoleController.php
+6
-2
BranchController.php
backend/controllers/v1/branch/BranchController.php
+12
-4
BranchServiceTypeController.php
...end/controllers/v1/branch/BranchServiceTypeController.php
+9
-3
TransportInitialPriceController.php
...trollers/v1/transport/TransportInitialPriceController.php
+3
-1
No files found.
backend/controllers/v1/authority/AuthorityRoleController.php
View file @
99fdac0d
...
@@ -97,6 +97,7 @@ class AuthorityRoleController extends BaseController
...
@@ -97,6 +97,7 @@ class AuthorityRoleController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=201,description="添加角色成功"),
* @OA\Response(response=201,description="添加角色成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -115,7 +116,8 @@ class AuthorityRoleController extends BaseController
...
@@ -115,7 +116,8 @@ class AuthorityRoleController extends BaseController
if
(
$model
->
save
())
{
if
(
$model
->
save
())
{
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
}
elseif
(
!
$model
->
hasErrors
())
{
}
elseif
(
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to create the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to create the object for unknown reason.');
throw
new
HttpException
(
500
,
'添加失败'
);
}
}
return
$model
;
return
$model
;
}
}
...
@@ -141,6 +143,7 @@ class AuthorityRoleController extends BaseController
...
@@ -141,6 +143,7 @@ class AuthorityRoleController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=202,description="修改角色成功"),
* @OA\Response(response=202,description="修改角色成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -160,7 +163,8 @@ class AuthorityRoleController extends BaseController
...
@@ -160,7 +163,8 @@ class AuthorityRoleController extends BaseController
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to update the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
throw
new
HttpException
(
500
,
'修改失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
return
$model
;
return
$model
;
...
...
backend/controllers/v1/branch/BranchController.php
View file @
99fdac0d
...
@@ -198,6 +198,7 @@ class BranchController extends BaseController
...
@@ -198,6 +198,7 @@ class BranchController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=201,description="门店添加成功"),
* @OA\Response(response=201,description="门店添加成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -264,7 +265,8 @@ class BranchController extends BaseController
...
@@ -264,7 +265,8 @@ class BranchController extends BaseController
if
(
$model
->
save
())
{
if
(
$model
->
save
())
{
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
}
elseif
(
!
$model
->
hasErrors
())
{
}
elseif
(
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to create the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to create the object for unknown reason.');
throw
new
HttpException
(
500
,
'添加失败'
);
}
}
return
$model
;
return
$model
;
}
}
...
@@ -464,6 +466,7 @@ class BranchController extends BaseController
...
@@ -464,6 +466,7 @@ class BranchController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=202,description="门店修改成功"),
* @OA\Response(response=202,description="门店修改成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -529,7 +532,8 @@ class BranchController extends BaseController
...
@@ -529,7 +532,8 @@ class BranchController extends BaseController
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to update the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
throw
new
HttpException
(
500
,
'修改失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
return
$model
;
return
$model
;
...
@@ -551,6 +555,7 @@ class BranchController extends BaseController
...
@@ -551,6 +555,7 @@ class BranchController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=203,description="门店删除成功"),
* @OA\Response(response=203,description="门店删除成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -562,7 +567,8 @@ class BranchController extends BaseController
...
@@ -562,7 +567,8 @@ class BranchController extends BaseController
if
(
!
$branchservice
)
{
if
(
!
$branchservice
)
{
throw
new
BadRequestHttpException
(
'没有找到要删除的记录'
);
throw
new
BadRequestHttpException
(
'没有找到要删除的记录'
);
}
else
if
(
$branchservice
->
delete
()
===
false
)
{
}
else
if
(
$branchservice
->
delete
()
===
false
)
{
throw
new
ServerErrorHttpException
(
'Failed to delete the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
throw
new
HttpException
(
500
,
'删除失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
203
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
203
);
...
@@ -1049,6 +1055,7 @@ class BranchController extends BaseController
...
@@ -1049,6 +1055,7 @@ class BranchController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=200,description="success"),
* @OA\Response(response=200,description="success"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -1082,7 +1089,8 @@ class BranchController extends BaseController
...
@@ -1082,7 +1089,8 @@ class BranchController extends BaseController
$model
->
setAttributes
(
$other_param
);
$model
->
setAttributes
(
$other_param
);
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to update the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
throw
new
HttpException
(
500
,
'修改失败'
);
}
}
return
$model
;
return
$model
;
}
}
...
...
backend/controllers/v1/branch/BranchServiceTypeController.php
View file @
99fdac0d
...
@@ -122,6 +122,7 @@ class BranchServiceTypeController extends BaseController
...
@@ -122,6 +122,7 @@ class BranchServiceTypeController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=201,description="服务类目添加成功"),
* @OA\Response(response=201,description="服务类目添加成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -144,7 +145,8 @@ class BranchServiceTypeController extends BaseController
...
@@ -144,7 +145,8 @@ class BranchServiceTypeController extends BaseController
if
(
$model
->
save
())
{
if
(
$model
->
save
())
{
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
201
);
}
elseif
(
!
$model
->
hasErrors
())
{
}
elseif
(
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to create the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to create the object for unknown reason.');
throw
new
HttpException
(
500
,
'添加失败'
);
}
}
return
$model
;
return
$model
;
}
}
...
@@ -169,6 +171,7 @@ class BranchServiceTypeController extends BaseController
...
@@ -169,6 +171,7 @@ class BranchServiceTypeController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=202,description="服务类目修改成功"),
* @OA\Response(response=202,description="服务类目修改成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -183,7 +186,8 @@ class BranchServiceTypeController extends BaseController
...
@@ -183,7 +186,8 @@ class BranchServiceTypeController extends BaseController
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
$model
->
setAttributes
(
Yii
::
$app
->
getRequest
()
->
post
());
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to update the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
throw
new
HttpException
(
500
,
'修改失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
return
$model
;
return
$model
;
...
@@ -205,6 +209,7 @@ class BranchServiceTypeController extends BaseController
...
@@ -205,6 +209,7 @@ class BranchServiceTypeController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=203,description="门店服务类目删除成功"),
* @OA\Response(response=203,description="门店服务类目删除成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -216,7 +221,8 @@ class BranchServiceTypeController extends BaseController
...
@@ -216,7 +221,8 @@ class BranchServiceTypeController extends BaseController
if
(
!
$branchservice
)
{
if
(
!
$branchservice
)
{
throw
new
BadRequestHttpException
(
'没有找到要删除的记录'
);
throw
new
BadRequestHttpException
(
'没有找到要删除的记录'
);
}
else
if
(
$branchservice
->
delete
()
===
false
)
{
}
else
if
(
$branchservice
->
delete
()
===
false
)
{
throw
new
ServerErrorHttpException
(
'Failed to delete the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
throw
new
HttpException
(
500
,
'删除失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
203
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
203
);
...
...
backend/controllers/v1/transport/TransportInitialPriceController.php
View file @
99fdac0d
...
@@ -117,6 +117,7 @@ class TransportInitialPriceController extends BaseController
...
@@ -117,6 +117,7 @@ class TransportInitialPriceController extends BaseController
* )
* )
* ),
* ),
* @OA\Response(response=202,description="门店起送价修改成功"),
* @OA\Response(response=202,description="门店起送价修改成功"),
* @OA\Response(response=500,description = "系统错误"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
*/
*/
...
@@ -134,7 +135,8 @@ class TransportInitialPriceController extends BaseController
...
@@ -134,7 +135,8 @@ class TransportInitialPriceController extends BaseController
$model
->
setAttributes
(
$param
);
$model
->
setAttributes
(
$param
);
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
if
(
$model
->
save
()
===
false
&&
!
$model
->
hasErrors
())
{
throw
new
ServerErrorHttpException
(
'Failed to update the object for unknown reason.'
);
// throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
throw
new
HttpException
(
500
,
'修改失败'
);
}
}
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
Yii
::
$app
->
getResponse
()
->
setStatusCode
(
202
);
return
$model
;
return
$model
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment