gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加了省市区的必要入参

Browse Source
This commit is contained in:
wucongxing8150 2024-06-13 14:53:42 +08:00
parent 2017e1cac4
commit 320f8745f4
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/requests/area.go
View File

@ -16,6 +16,7 @@ type GetAreaList struct {
// AddArea 新增地区 // AddArea 新增地区
type AddArea struct { type AddArea struct {
AreaId string `json:"area_id" form:"area_id" label:"名称" validate:"required"`
AreaName string `json:"area_name" form:"area_name" label:"名称" validate:"required"` AreaName string `json:"area_name" form:"area_name" label:"名称" validate:"required"`
ParentId string `json:"parent_id" form:"parent_id" label:"上级编号" validate:"required"` ParentId string `json:"parent_id" form:"parent_id" label:"上级编号" validate:"required"`
AreaType *int `json:"area_type" form:"area_type" label:"类型(1:国家,2:省,3:市,4:区县)" validate:"required"` AreaType *int `json:"area_type" form:"area_type" label:"类型(1:国家,2:省,3:市,4:区县)" validate:"required"`
@ -24,6 +25,7 @@ type AddArea struct {
// PutArea 修改地区 // PutArea 修改地区
type PutArea struct { type PutArea struct {
AreaId string `json:"area_id" form:"area_id" label:"名称" validate:"required"`
AreaName string `json:"area_name" form:"area_name" label:"名称" validate:"required"` AreaName string `json:"area_name" form:"area_name" label:"名称" validate:"required"`
Zip string `json:"zip" form:"zip" label:"邮编"` Zip string `json:"zip" form:"zip" label:"邮编"`
} }

21
api/service/area.go
View File

@ -53,8 +53,15 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, string, error) {
return false, "", errors.New("新增失败") return false, "", errors.New("新增失败")
} }
areaId, err := strconv.ParseInt(req.AreaId, 10, 64)
if err != nil {
tx.Rollback()
return false, "", errors.New("新增失败")
}
// 新增优惠卷表 // 新增优惠卷表
area := &model.Area{ area := &model.Area{
AreaId: areaId,
AreaName: req.AreaName, AreaName: req.AreaName,
ParentId: parentId, ParentId: parentId,
Zip: req.Zip, Zip: req.Zip,
@ -67,10 +74,8 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, string, error) {
return false, "", errors.New(err.Error()) return false, "", errors.New(err.Error())
} }
areaId := fmt.Sprintf("%d", area.AreaId)
tx.Commit() tx.Commit()
return true, areaId, nil return true, fmt.Sprintf("%d", area.AreaId), nil
} }
// PutArea 修改地区 // PutArea 修改地区
@ -102,6 +107,16 @@ func (r *AreaService) PutArea(areaId int, req requests.PutArea) (bool, error) {
} }
} }
if req.AreaId != "" {
areaId, err := strconv.ParseInt(req.AreaId, 10, 64)
if err != nil {
tx.Rollback()
return false, errors.New("修改失败")
}
areaData["area_id"] = areaId
}
if len(areaData) > 0 { if len(areaData) > 0 {
err = areaDao.EditAreaById(tx, areaId, areaData) err = areaDao.EditAreaById(tx, areaId, areaData)
if err != nil || area == nil { if err != nil || area == nil {