增加了省市区的必要入参

2024-06-13 14:53:42 +08:00
parent 2017e1cac4
commit 320f8745f4
2 changed files with 20 additions and 3 deletions
@@ -53,8 +53,15 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, string, error) {
 		return false, "", errors.New("新增失败")
 	}

+	areaId, err := strconv.ParseInt(req.AreaId, 10, 64)
+	if err != nil {
+		tx.Rollback()
+		return false, "", errors.New("新增失败")
+	}
+
 	// 新增优惠卷表
 	area := &model.Area{
+		AreaId:   areaId,
 		AreaName: req.AreaName,
 		ParentId: parentId,
 		Zip:      req.Zip,
@@ -67,10 +74,8 @@ func (r *AreaService) AddArea(req requests.AddArea) (bool, string, error) {
 		return false, "", errors.New(err.Error())
 	}

-	areaId := fmt.Sprintf("%d", area.AreaId)
-
 	tx.Commit()
-	return true, areaId, nil
+	return true, fmt.Sprintf("%d", area.AreaId), nil
 }

 // 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 {
 		err = areaDao.EditAreaById(tx, areaId, areaData)
 		if err != nil || area == nil {