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

server/product/internal/logic/getrecommandproductlistlogic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"errors"
-	"fusenapi/constants"
+	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/format"
@@ -46,15 +46,23 @@ func (l *GetRecommandProductListLogic) GetRecommandProductList(req *types.GetRec
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get detail product info")
 	}
-	//随机取产品列表(不包含详情产品)
-	recommendProductList, err := l.svcCtx.AllModels.FsProductRecommend.GetIgnoreRandomRecommendProductList(l.ctx, int(req.Num), int64(constants.PRODUCT_DETAIL_RECOMMEND_CATEGORY), []int64{productInfo.Id})
-	if err != nil {
-		logx.Error(err)
-		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get random recommend  list")
+	var (
+		recommendProductList []gmodel.FsProduct
+	)
+	if productInfo.RecommendProduct != nil && *productInfo.RecommendProduct != "" {
+		recommendProductIds, err := format.StrSlicToInt64Slice(strings.Split(*productInfo.RecommendProduct, ","))
+		if err != nil {
+			logx.Error(err)
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to split recommend product ids")
+		}
+		recommendProductList, err = l.svcCtx.AllModels.FsProduct.GetProductListByIds(l.ctx, recommendProductIds, "")
+		if err != nil {
+			logx.Error(err)
+			return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get recommend product list")
+		}
 	}
 	//需要填充时需要忽略的id
-	ignoreProductIds := make([]int64, 0, len(recommendProductList)+1)
-	ignoreProductIds = append(ignoreProductIds, productInfo.Id)
+	ignoreProductIds := make([]int64, 0, len(recommendProductList))
 	productIds := make([]int64, 0, len(recommendProductList))
 	//在合并之前记住推荐的产品
 	mapRecommend := make(map[int64]struct{})

server/product/internal/logic/gettagproductlistlogic.go

@@ -363,7 +363,7 @@ func (l *GetTagProductListLogic) getTagProducts(req getTagProductsReq) (productL
 		}
 		image.ThousandFaceImageFormat(&r)
 		item.Cover = r.Cover
-		item.CoverDefault = r.CoverDefault
+		item.CoverDefault = nil
 		//加入分类产品切片
 		productListRsp = append(productListRsp, item)
 	}

server/product/internal/logic/homepagerecommendproductlistlogic.go

@@ -3,7 +3,6 @@ package logic
 import (
 	"errors"
 	"fmt"
-	"fusenapi/constants"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
@@ -55,10 +54,9 @@ func (l *HomePageRecommendProductListLogic) HomePageRecommendProductList(req *ty
 	)
 	//获取列表推荐产品
 	recommendProductList, _, err = l.svcCtx.AllModels.FsProductRecommend.GetRecommendProductList(gmodel.GetRecommendProductListReq{
-		Ctx:      l.ctx,
-		Page:     1,
-		Limit:    500, //设置最大500
-		Category: int64(constants.HOME_PAGE_RECOMMEND_CATEGORY),
+		Ctx:   l.ctx,
+		Page:  1,
+		Limit: 500, //设置最大500
 	})
 	if len(recommendProductList) == 0 {
 		return resp.SetStatusWithMessage(basic.CodeOK, "success", []interface{}{})

server/product/internal/types/types.go

@@ -268,15 +268,20 @@ type TagItem struct {
 }
 
 type TagProduct struct {
-	ProductId           int64  `json:"product_id"`
-	Sn                  string `json:"sn"`
-	Title               string `json:"title"`
-	Cover               string `json:"cover"`
-	SizeNum             uint32 `json:"size_num"`
-	MinPrice            int64  `json:"min_price"`
-	CoverDefault        string `json:"cover_default"`
-	HaveOptionalFitting bool   `json:"have_optional_fitting"`
-	Recommended         bool   `json:"recommended"`
+	ProductId           int64              `json:"product_id"`
+	Sn                  string             `json:"sn"`
+	Title               string             `json:"title"`
+	Cover               string             `json:"cover"`
+	SizeNum             uint32             `json:"size_num"`
+	MinPrice            int64              `json:"min_price"`
+	CoverDefault        []CoverDefaultItem `json:"cover_default"`
+	HaveOptionalFitting bool               `json:"have_optional_fitting"`
+	Recommended         bool               `json:"recommended"`
+}
+
+type CoverDefaultItem struct {
+	Tag   string `json:"tag"`
+	Cover string `json:"cover"`
 }
 
 type GetRenderDesignReq struct {