Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
This commit is contained in:
commit
fff760253a
|
@ -113,10 +113,12 @@ func (l *GetTagProductListLogic) GetTagProductList(req *types.GetTagProductListR
|
|||
mapTagLevel := make(map[string]*types.TagItem)
|
||||
//处理tags数据
|
||||
minLevel := 0 //层级最高层(即prefix层级路径最短)
|
||||
mapTagProduct := make(map[int64]types.TagProduct)
|
||||
if err = l.dealWithTagMenuData(dealWithTagMenuDataReq{
|
||||
TagList: tagList,
|
||||
WithProduct: req.WithProduct,
|
||||
ProductList: productList,
|
||||
MapTagProduct: mapTagProduct,
|
||||
MapTagProp: mapTagProp,
|
||||
MapProductMinPrice: mapProductMinPrice,
|
||||
MapProductTemplate: mapProductTemplate,
|
||||
|
@ -132,7 +134,7 @@ func (l *GetTagProductListLogic) GetTagProductList(req *types.GetTagProductListR
|
|||
return resp.SetStatusAddMessage(basic.CodeServiceErr, "failed to deal with tag data")
|
||||
}
|
||||
//组装等级从属关系
|
||||
rspTagList, TotalCategoryProduct := l.organizationLevelRelation(minLevel, mapTagLevel)
|
||||
rspTagList, TotalCategoryProduct := l.organizationLevelRelation(minLevel, mapTagLevel, productList, mapTagProduct)
|
||||
return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetTagProductListRsp{
|
||||
TotalCategoryProduct: TotalCategoryProduct,
|
||||
TagList: rspTagList,
|
||||
|
@ -262,6 +264,7 @@ type dealWithTagMenuDataReq struct {
|
|||
TagList []gmodel.FsTags
|
||||
WithProduct bool
|
||||
ProductList []gmodel.FsProduct
|
||||
MapTagProduct map[int64]types.TagProduct
|
||||
MapTagProp map[int64][]types.CoverDefaultItem
|
||||
ProductTagPropList []gmodel.FsProductTagProp
|
||||
MapProductMinPrice map[int64]int64
|
||||
|
@ -308,7 +311,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq)
|
|||
})
|
||||
//tag中产品
|
||||
for _, tmpProduct := range productListRsp {
|
||||
tagTem.TagProductList = append(tagTem.TagProductList, tmpProduct)
|
||||
tagTem.TagProductList = append(tagTem.TagProductList, tmpProduct.ProductId)
|
||||
}
|
||||
}
|
||||
//加入分类
|
||||
|
@ -318,7 +321,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq)
|
|||
}
|
||||
|
||||
// 组织等级从属关系
|
||||
func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagLevel map[string]*types.TagItem) (rspTagList []types.TagItem, productCount int) {
|
||||
func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagLevel map[string]*types.TagItem, productList []gmodel.FsProduct, mapTagProduct map[int64]types.TagProduct) (rspTagList []types.TagItem, productCount int) {
|
||||
mapTop := make(map[string]struct{})
|
||||
//设置归属关系
|
||||
for prefix, tagItem := range mapTagLevel {
|
||||
|
@ -341,16 +344,29 @@ func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagL
|
|||
})
|
||||
mapTagLevel[parentPrefix] = parent
|
||||
}
|
||||
//把子类的产品列表变成产品id列表并且把产品列表都放到最顶级父级中
|
||||
//顶层集子类产品于一身
|
||||
for _, v := range mapTagLevel {
|
||||
if _, ok := mapTop[v.LevelPrefix]; ok {
|
||||
if _, ok := mapTop[v.LevelPrefix]; !ok {
|
||||
continue
|
||||
}
|
||||
topPrefixSlic := strings.Split(v.LevelPrefix, "/")[:minLevel]
|
||||
topPrefix := strings.Join(topPrefixSlic, "/")
|
||||
for k, tmpProduct := range v.TagProductList {
|
||||
v.TagProductList[k] = tmpProduct.(types.TagProduct).ProductId
|
||||
mapTagLevel[topPrefix].TagProductList = append(mapTagLevel[topPrefix].TagProductList, tmpProduct)
|
||||
//初始化
|
||||
v.TagProductList = make([]interface{}, 0, 20)
|
||||
mapTypeId := make(map[int64]struct{})
|
||||
for _, v2 := range mapTagLevel {
|
||||
if strings.Contains(v2.LevelPrefix, v.LevelPrefix) {
|
||||
mapTypeId[v.TypeId] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, p := range productList {
|
||||
_, ok := mapTypeId[*p.Type]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
tagProduct, ok := mapTagProduct[p.Id]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
v.TagProductList = append(v.TagProductList, tagProduct)
|
||||
}
|
||||
}
|
||||
//最终值提取最高级别那一层出来
|
||||
|
|
Loading…
Reference in New Issue
Block a user