feature/develop:区域相关信息编辑修改删除的功能异常

opms_parent/app/handler/base/region.go

@@ -68,6 +68,32 @@ func (p *RegionHandler) CreateRegion(ctx context.Context, req *model.AddRegionRe
 	return nil
 }
 
+// UpdateRegionById 修改销售区域
+func (p *RegionHandler) UpdateRegionById(ctx context.Context, req *model.RegionUpdateReq, rsp *comm_def.CommonMsg) error {
+	regionServer, err := server.NewSalesRegionService(ctx)
+	if err != nil {
+		return err
+	}
+	err = regionServer.UpdateById(req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// DeleteRegionById 删除销售地区
+func (p *RegionHandler) DeleteRegionById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
+	regionServer, err := server.NewSalesRegionService(ctx)
+	if err != nil {
+		return err
+	}
+	err = regionServer.DeleteById(req.Id)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // CreateRegionDetail 创建详细销售地区
 func (r *RegionHandler) CreateRegionDetail(ctx context.Context, req *model.AddBaseRegionDetailReq, rsp *comm_def.CommonMsg) error {
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {

opms_parent/app/model/base/base_district.go

@@ -28,7 +28,8 @@ type ProvincesTree struct {
 	Children []*ProvincesTree `json:"children"`
 }
 type Province struct {
-	Id       int    `json:"id"`
-	ParentId int    `json:"parentId"`
-	DistName string `json:"distName" `
+	Id       int              `json:"id"`
+	ParentId int              `json:"parentId"`
+	DistName string           `json:"distName" `
+	Children []*ProvincesTree `json:"children"`
 }

opms_parent/app/model/base/base_sales_region.go

@@ -26,6 +26,11 @@ type AddRegionReq struct {
 	Remark     string
 }
 
+type RegionUpdateReq struct {
+	Id         int    `p:"id" json:"id" `
+	RegionDesc string `p:"regionDesc" json:"regionDesc" `
+}
+
 type Region struct {
 	Id         int         `p:"id" json:"id" `
 	RegionCode string      `p:"regionCode" json:"regionCode" `

opms_parent/app/service/base/base_district.go

@@ -79,6 +79,23 @@ func (s *districtService) GetProvinceList() (list []*model.Province, err error)
 		g.Log().Error(err)
 		return
 	}
-
+	ParentIds := make([]int, 0)
+	ChildList := make([]*model.ProvincesTree, 0)
+	cityMap := make(map[int][]*model.ProvincesTree)
+	for _, v := range list {
+		ParentIds = append(ParentIds, v.Id)
+	}
+	// 获取所有省份下的市
+	err = s.Dao.WhereIn("parent_id", ParentIds).Scan(&ChildList)
+	if err != nil {
+		g.Log().Error(err)
+		return
+	}
+	for _, item := range ChildList {
+		cityMap[item.ParentId] = append(cityMap[item.ParentId], item)
+	}
+	for _, item := range list {
+		item.Children = cityMap[item.Id]
+	}
 	return
 }

opms_parent/app/service/base/base_sales_region.go

@@ -48,6 +48,26 @@ func (s *salesRegionService) Create(req *model.AddRegionReq) (err error) {
 	return nil
 }
 
+// UpdateById 修改区域
+func (s *salesRegionService) UpdateById(req *model.RegionUpdateReq) (err error) {
+	_, err = s.Dao.Where("id", req.Id).Data(g.Map{"region_desc": req.RegionDesc}).Update()
+	if err != nil {
+		g.Log().Error(err)
+		return
+	}
+	return nil
+}
+
+// DeleteById 删除区域
+func (s *salesRegionService) DeleteById(id int64) (err error) {
+	_, err = s.Dao.Where("id", id).Delete()
+	if err != nil {
+		g.Log().Error(err)
+		return
+	}
+	return nil
+}
+
 // GetRegionList 获取区域
 func (s *salesRegionService) GetRegionList() (RegionList []*model.Region, err error) {
 	err = s.Dao.Order("id asc").Scan(&RegionList)