Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

server/product/internal/logic/gettagproductlistlogic.go

@@ -172,7 +172,7 @@ func (l *GetTagProductListLogic) getProductRelationInfo(req getProductRelationIn
 			IsDel:   &pIsDel,
 			IsShelf: &pIsShelf,
 			Status:  &pStatus,
-			OrderBy: "`is_recommend` DESC,`sort` ASC",
+			OrderBy: "`sort` ASC", //产品序号升序排序
 		})
 	if err != nil {
 		logx.Error(err)
@@ -312,6 +312,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq)
 			//tag中产品
 			for _, tmpProduct := range productListRsp {
 				tagTem.TagProductList = append(tagTem.TagProductList, tmpProduct.ProductId)
+				req.MapTagProduct[tmpProduct.ProductId] = tmpProduct
 			}
 		}
 		//加入分类
@@ -354,7 +355,7 @@ func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagL
 		mapTypeId := make(map[int64]struct{})
 		for _, v2 := range mapTagLevel {
 			if strings.Contains(v2.LevelPrefix, v.LevelPrefix) {
-				mapTypeId[v.TypeId] = struct{}{}
+				mapTypeId[v2.TypeId] = struct{}{}
 			}
 		}
 		for _, p := range productList {