diff --git a/server/product/internal/logic/gettagproductlistlogic.go b/server/product/internal/logic/gettagproductlistlogic.go index cce5378b..cffccbbf 100644 --- a/server/product/internal/logic/gettagproductlistlogic.go +++ b/server/product/internal/logic/gettagproductlistlogic.go @@ -129,10 +129,9 @@ func (l *GetTagProductListLogic) GetTagProductList(req *types.GetTagProductListR return resp.SetStatusAddMessage(basic.CodeServiceErr, "failed to deal with tag data") } //组装等级从属关系 - rspTagList, mapTagRsp, TotalCategoryProduct := l.organizationLevelRelation(minLevel, mapTagLevel, productList, mapTagProduct) + mapTagRsp, TotalCategoryProduct := l.organizationLevelRelation(minLevel, mapTagLevel, productList, mapTagProduct) return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetTagProductListRsp{ TotalCategoryProduct: TotalCategoryProduct, - TagList: rspTagList, TagMap: mapTagRsp, }) } @@ -321,7 +320,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq) } // 组织等级从属关系 -func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagLevel map[string]*types.TagItem, productList []gmodel.FsProduct, mapTagProduct map[int64]types.TagProduct) (rspTagList []types.TagItem, mapTagRsp map[int64]types.TagItem, productCount int) { +func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagLevel map[string]*types.TagItem, productList []gmodel.FsProduct, mapTagProduct map[int64]types.TagProduct) (mapTagRsp map[int64]types.TagItem, productCount int) { mapTop := make(map[string]struct{}) mapTagRsp = make(map[int64]types.TagItem) //设置归属关系 @@ -371,21 +370,21 @@ func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagL } } //最终值提取最高级别那一层出来 - rspList := make([]types.TagItem, 0, len(mapTagLevel)) + //rspList := make([]types.TagItem, 0, len(mapTagLevel)) for prefix, _ := range mapTop { //大类下没有任何产品则不显示 if len(mapTagLevel[prefix].TagProductList) == 0 { continue } productCount += len(mapTagLevel[prefix].TagProductList) - rspList = append(rspList, *mapTagLevel[prefix]) + //rspList = append(rspList, *mapTagLevel[prefix]) mapTagRsp[mapTagLevel[prefix].TypeId] = *mapTagLevel[prefix] } //排序 - sort.SliceStable(rspList, func(i, j int) bool { + /*sort.SliceStable(rspList, func(i, j int) bool { return rspList[i].Sort < rspList[j].Sort - }) - return rspList, mapTagRsp, productCount + })*/ + return mapTagRsp, productCount } // 获取某个tag的直属产品 diff --git a/server/product/internal/types/types.go b/server/product/internal/types/types.go index c1833896..3587d1b7 100644 --- a/server/product/internal/types/types.go +++ b/server/product/internal/types/types.go @@ -36,7 +36,6 @@ type GetTagProductListReq struct { type GetTagProductListRsp struct { TotalCategoryProduct int `json:"total_category_product"` - TagList []TagItem `json:"tag_list"` TagMap interface{} `json:"tag_map"` } diff --git a/server_api/product.api b/server_api/product.api index 7dc15731..03b27648 100644 --- a/server_api/product.api +++ b/server_api/product.api @@ -78,7 +78,6 @@ type GetTagProductListReq { } type GetTagProductListRsp { TotalCategoryProduct int `json:"total_category_product"` - TagList []TagItem `json:"tag_list"` TagMap interface{} `json:"tag_map"` } type TagItem {