From a240d9a3e3edd36faaff5a1b165a27447e9244d1 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 11:11:49 +0800 Subject: [PATCH] fix --- model/gmodel/fs_product_logic.go | 4 ++-- server/product/internal/logic/getrecommendproductlistlogic.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/gmodel/fs_product_logic.go b/model/gmodel/fs_product_logic.go index e2e16e42..5cefe921 100755 --- a/model/gmodel/fs_product_logic.go +++ b/model/gmodel/fs_product_logic.go @@ -88,9 +88,9 @@ func (p *FsProductModel) GetRandomProductList(ctx context.Context, limit int) (r Where("`is_del` =? and `is_shelf` = ?", 0, 1).Order("RAND()").Limit(limit).Find(&resp).Error return resp, err } -func (p *FsProductModel) GetIgnoreRandomProductList(ctx context.Context, limit int, notInProductIds []int64) (resp []FsProduct, err error) { +func (p *FsProductModel) GetIgnoreRandomProductList(ctx context.Context, category int, limit int, notInProductIds []int64) (resp []FsProduct, err error) { db := p.db.WithContext(ctx).Model(&FsProduct{}). - Where("`is_del` =? and `is_shelf` = ? ", 0, 1) + Where("`is_del` =? and `is_shelf` = ? and `category` = ?", 0, 1, category) if len(notInProductIds) > 0 { db = db.Where("`id` not in(?)", notInProductIds) } diff --git a/server/product/internal/logic/getrecommendproductlistlogic.go b/server/product/internal/logic/getrecommendproductlistlogic.go index 072b9164..e6f9d762 100644 --- a/server/product/internal/logic/getrecommendproductlistlogic.go +++ b/server/product/internal/logic/getrecommendproductlistlogic.go @@ -84,7 +84,7 @@ func (l *GetRecommendProductListLogic) GetRecommendProductList(req *types.GetRec lenRecommendProduct := len(recommendProductList) if lenRecommendProduct < int(req.Num) { appendNum := int(req.Num) - lenRecommendProduct - productList, err := l.svcCtx.AllModels.FsProduct.GetIgnoreRandomProductList(l.ctx, appendNum, ignoreProductIds) + productList, err := l.svcCtx.AllModels.FsProduct.GetIgnoreRandomProductList(l.ctx, 1, appendNum, ignoreProductIds) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get product list")