diff --git a/api/controller/area.go b/api/controller/area.go index d61a027..abf04c6 100644 --- a/api/controller/area.go +++ b/api/controller/area.go @@ -64,13 +64,13 @@ func (r *Area) AddArea(c *gin.Context) { // 业务处理 areaService := service.AreaService{} - _, err := areaService.AddArea(req) + _, areaId, err := areaService.AddArea(req) if err != nil { responses.FailWithMessage(err.Error(), c) return } - responses.Ok(c) + responses.OkWithData(areaId, c) } // PutArea 修改地区 diff --git a/api/service/area.go b/api/service/area.go index 15f24fa..bb58daf 100644 --- a/api/service/area.go +++ b/api/service/area.go @@ -13,9 +13,9 @@ import ( type AreaService struct{} // AddArea 新增地区 -func (r *AreaService) AddArea(req requests.AddArea) (bool, error) { +func (r *AreaService) AddArea(req requests.AddArea) (bool, string, error) { if *req.AreaType == 1 { - return false, errors.New("不可添加国家") + return false, "", errors.New("不可添加国家") } // 检测上级是否存在 @@ -35,7 +35,7 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, error) { areaDao := dao.AreaDao{} _, err := areaDao.GetAreaList(maps) if err != nil { - return false, errors.New("上级地区错误") + return false, "", errors.New("上级地区错误") } // 开始事务 @@ -50,7 +50,7 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, error) { parentId, err := strconv.ParseInt(req.ParentId, 10, 64) if err != nil { tx.Rollback() - return false, errors.New("新增失败") + return false, "", errors.New("新增失败") } // 新增优惠卷表 @@ -64,11 +64,13 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, error) { area, err = areaDao.AddArea(tx, area) if err != nil || area == nil { tx.Rollback() - return false, errors.New(err.Error()) + return false, "", errors.New(err.Error()) } + areaId := fmt.Sprintf("%d", area.AreaId) + tx.Commit() - return true, nil + return true, areaId, nil } // PutArea 修改地区