ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

enhance(response):统一响应代码。

Browse Source
This commit is contained in:
徐涛
2022-08-13 18:20:21 +08:00
parent 64d63e7f20
commit e56974af3c
2 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
controller/user.go
View File

@@ -99,14 +99,14 @@ func (_UserController) InvalidUserPassword(c *gin.Context) {
return
}
if _, ok := err.(exceptions.UnsuccessfulOperationError); ok {
result.Error(500, "未能成功更新用户的密码。")
result.NotAccept("未能成功更新用户的密码。")
return
}
if err != nil {
result.Error(500, err.Error())
result.Error(http.StatusInternalServerError, err.Error())
return
}
result.Json(http.StatusOK, http.StatusAccepted, "用户密码已经失效", gin.H{"verify": verifyCode})
result.Json(http.StatusAccepted, "用户密码已经失效", gin.H{"verify": verifyCode})
}
type ResetPasswordFormData struct {
@@ -166,11 +166,10 @@ func (_UserController) ListPagedUser(c *gin.Context) {
}
users, total, err := repository.UserRepo.ListUserDetail(requestKeyword, requestUserType, requestUserStat, requestPage)
if err != nil {
result.Error(http.StatusNotFound, err.Error())
result.NotFound(err.Error())
return
}
result.Json(
http.StatusOK,
http.StatusOK,
"已取得符合条件的用户集合。",
response.NewPagedResponse(requestPage, total).ToMap(),
@@ -190,7 +189,7 @@ func (_UserController) SwitchUserEnabling(c *gin.Context) {
err := service.UserService.SwitchUserState(switchForm.UserID, switchForm.Enabled)
if err != nil {
if nfErr, ok := err.(*exceptions.NotFoundError); ok {
result.Error(http.StatusNotFound, nfErr.Message)
result.NotFound(nfErr.Message)
return
} else {
result.Error(http.StatusInternalServerError, err.Error())
@@ -214,7 +213,7 @@ func (_UserController) CreateOPSAndManagementAccount(c *gin.Context) {
c.BindJSON(creationForm)
exists, err := service.UserService.IsUsernameExists(creationForm.Username)
if exists {
result.Error(http.StatusConflict, "指定的用户名已经被使用了。")
result.Conflict("指定的用户名已经被使用了。")
return
}
if err != nil {
@@ -236,7 +235,7 @@ func (_UserController) CreateOPSAndManagementAccount(c *gin.Context) {
result.Error(http.StatusInternalServerError, err.Error())
return
}
result.Json(http.StatusOK, http.StatusOK, "用户已经成功创建。", gin.H{"verify": verifyCode})
result.Json(http.StatusCreated, "用户已经成功创建。", gin.H{"verify": verifyCode})
}
func (_UserController) GetUserDetail(c *gin.Context) {
@@ -255,7 +254,7 @@ func (_UserController) GetUserDetail(c *gin.Context) {
result.Error(http.StatusInternalServerError, err.Error())
return
}
result.Json(http.StatusOK, http.StatusOK, "用户详细信息已获取到。", gin.H{"user": userDetail})
result.Json(http.StatusOK, "用户详细信息已获取到。", gin.H{"user": userDetail})
}
type EnterpriseCreationFormData struct {
@@ -274,7 +273,7 @@ func (_UserController) CreateEnterpriseAccount(c *gin.Context) {
c.BindJSON(creationForm)
exists, err := service.UserService.IsUsernameExists(creationForm.Username)
if exists {
result.Error(http.StatusConflict, "指定的用户名已经被使用了。")
result.Conflict("指定的用户名已经被使用了。")
return
}
if err != nil {
@@ -291,7 +290,7 @@ func (_UserController) CreateEnterpriseAccount(c *gin.Context) {
newUserDetail.Phone = creationForm.Phone
newUserDetail.UnitServiceFee, err = decimal.NewFromString(*creationForm.UnitServiceFee)
if err != nil {
result.Error(http.StatusBadRequest, "用户月服务费无法解析。")
result.BadRequest("用户月服务费无法解析。")
return
}
newUserDetail.ServiceExpiration = time.Now()
@@ -301,5 +300,5 @@ func (_UserController) CreateEnterpriseAccount(c *gin.Context) {
result.Error(http.StatusInternalServerError, err.Error())
return
}
result.Json(http.StatusOK, http.StatusOK, "用户已经成功创建。", gin.H{"verify": verifyCode})
result.Json(http.StatusCreated, "用户已经成功创建。", gin.H{"verify": verifyCode})
}