From c9dfec717cbd89a0a73d768bafb5d085de9ae6b8 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 15 Aug 2023 15:47:39 +0800
Subject: [PATCH] fix

---
 model/gmodel/fs_product_template_tags_logic.go      | 10 +++++++---
 .../internal/logic/getproducttemplatetagslogic.go   |  2 +-
 server/render/consumer/assemble_render_data.go      | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/model/gmodel/fs_product_template_tags_logic.go b/model/gmodel/fs_product_template_tags_logic.go
index 5ef7e6ae..96d4cca2 100755
--- a/model/gmodel/fs_product_template_tags_logic.go
+++ b/model/gmodel/fs_product_template_tags_logic.go
@@ -32,14 +32,18 @@ func (pt *FsProductTemplateTagsModel) GetList(ctx context.Context, page, limit i
 	err = db.Offset(offset).Limit(limit).Find(&resp).Error
 	return resp, err
 }
-func (pt *FsProductTemplateTagsModel) GetListByTitles(ctx context.Context, titles []string, limit int, orderBy string) (resp []FsProductTemplateTags, err error) {
-	if len(titles) == 0 {
+func (pt *FsProductTemplateTagsModel) GetListByTagNames(ctx context.Context, tagNames []string, limit int, orderBy string) (resp []FsProductTemplateTags, err error) {
+	if len(tagNames) == 0 {
 		return nil, nil
 	}
-	db := pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`title` in (?) and `status` = ?", titles, 1)
+	db := pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`title` in (?) and `status` = ?", tagNames, 1)
 	if orderBy != "" {
 		db = db.Order(orderBy)
 	}
 	err = db.Limit(limit).Find(&resp).Error
 	return resp, err
 }
+func (pt *FsProductTemplateTagsModel) FindOneByTagName(ctx context.Context, tagName string) (resp *FsProductTemplateTags, err error) {
+	err = pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`title` = ? and `status` = ?", tagName, 1).Take(&resp).Error
+	return resp, err
+}
diff --git a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go
index 3653614b..d0c8377f 100644
--- a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go
+++ b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go
@@ -72,7 +72,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
 				logx.Error(err)
 				return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid format of metadata`s template_tagid")
 			}
-			productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTitles(l.ctx, templateTagNameList, req.Limit, "id DESC")
+			productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, "id DESC")
 		}
 	}
 	if err != nil {
diff --git a/server/render/consumer/assemble_render_data.go b/server/render/consumer/assemble_render_data.go
index 89fadf6c..96e6a38f 100644
--- a/server/render/consumer/assemble_render_data.go
+++ b/server/render/consumer/assemble_render_data.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"fusenapi/constants"
 	"fusenapi/initalize"
 	"fusenapi/server/render/internal/svc"
@@ -48,8 +49,18 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 		return nil //不返回错误就删除消息
 	}
 	rabbitmq := initalize.RabbitMqHandle{}
+	//根据templateTag获取templateTagId(后续模板表的tag改成template_tag后可能就不需要这个步骤了)
+	templateTag, err := svcCtx.AllModels.FsProductTemplateTags.FindOneByTagName(ctx, parseInfo.RenderData.TemplateTag)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			logx.Error("can`t find template tag info by template tag:", parseInfo.RenderData.TemplateTag)
+			return nil
+		}
+		logx.Error("failed to get template tag info")
+		return nil
+	}
 	//获取模板（模板标签下的对一个物料的的模板）
-	productTemplate, err := svcCtx.AllModels.FsProductTemplateV2.FindOneByProductIdTagIdWithSizeTable(ctx, parseInfo.RenderData.ProductId, "8" /*parseInfo.RenderData.TemplateTag*/)
+	productTemplate, err := svcCtx.AllModels.FsProductTemplateV2.FindOneByProductIdTagIdWithSizeTable(ctx, parseInfo.RenderData.ProductId, fmt.Sprintf("%d", templateTag.Id))
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			logx.Error("template info is not found")