From 37d32a26ab5381adf170eb3a28a16f2c07aa4e9a Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 18 Aug 2023 10:26:33 +0800
Subject: [PATCH] fix

---
 .../internal/logic/gettemplatebypidlogic.go       | 15 +++------------
 server/product/internal/types/types.go            |  6 +++---
 server_api/product.api                            |  6 +++---
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/server/product/internal/logic/gettemplatebypidlogic.go b/server/product/internal/logic/gettemplatebypidlogic.go
index 7612c61c..e0d46ac3 100644
--- a/server/product/internal/logic/gettemplatebypidlogic.go
+++ b/server/product/internal/logic/gettemplatebypidlogic.go
@@ -37,8 +37,8 @@ func (l *GetTemplateByPidLogic) GetTemplateByPid(req *types.GetTemplateByPidReq,
 	if req.Pid == "" {
 		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "err param:pid is empty")
 	}
-	if req.ProductTemplateTagId <= 0 {
-		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "err param:product_template_tag_id")
+	if req.TemplateTag == "" {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "err param:template_tag")
 	}
 	//获取产品信息(只获取id)
 	productInfo, err := l.svcCtx.AllModels.FsProduct.FindOneBySn(l.ctx, req.Pid, "id")
@@ -67,15 +67,6 @@ func (l *GetTemplateByPidLogic) GetTemplateByPid(req *types.GetTemplateByPidReq,
 	} else { //指定物料
 		sizeIds = append(sizeIds, req.ProductSizeId)
 	}
-	//获取templatetag信息
-	templateTagInfo, err := l.svcCtx.AllModels.FsProductTemplateTags.FindOne(l.ctx, req.ProductTemplateTagId)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "template tag is not exists")
-		}
-		logx.Error(err)
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "failed to get template tag")
-	}
 	//根据尺寸id获取模型
 	modelList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllBySizeIdsTag(l.ctx, sizeIds, constants.TAG_MODEL)
 	if err != nil {
@@ -92,7 +83,7 @@ func (l *GetTemplateByPidLogic) GetTemplateByPid(req *types.GetTemplateByPidReq,
 		mapModel[v.Id] = k
 	}
 	//查询模型ids下对应tag标签的模板
-	templateList, err := l.svcCtx.AllModels.FsProductTemplateV2.FindAllByModelIdsTemplateTag(l.ctx, modelIds, *templateTagInfo.TemplateTag, "")
+	templateList, err := l.svcCtx.AllModels.FsProductTemplateV2.FindAllByModelIdsTemplateTag(l.ctx, modelIds, req.TemplateTag, "")
 	if err != nil {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template list")
diff --git a/server/product/internal/types/types.go b/server/product/internal/types/types.go
index ac643648..7d511c6e 100644
--- a/server/product/internal/types/types.go
+++ b/server/product/internal/types/types.go
@@ -341,9 +341,9 @@ type GetSizeByPidRsp struct {
 }
 
 type GetTemplateByPidReq struct {
-	Pid                  string `form:"pid"`
-	ProductSizeId        int64  `form:"product_size_id,optional"`
-	ProductTemplateTagId int64  `form:"product_template_tag_id"`
+	Pid           string `form:"pid"`
+	ProductSizeId int64  `form:"product_size_id,optional"`
+	TemplateTag   string `form:"template_tag"`
 }
 
 type GetFittingByPidReq struct {
diff --git a/server_api/product.api b/server_api/product.api
index abc24c02..8a6fdbf8 100644
--- a/server_api/product.api
+++ b/server_api/product.api
@@ -386,9 +386,9 @@ type GetSizeByPidRsp {
 }
 //获取产品模板
 type GetTemplateByPidReq {
-	Pid                  string `form:"pid"`
-	ProductSizeId        int64  `form:"product_size_id,optional"`
-	ProductTemplateTagId int64  `form:"product_template_tag_id"`
+	Pid           string `form:"pid"`
+	ProductSizeId int64  `form:"product_size_id,optional"`
+	TemplateTag   string `form:"template_tag"`
 }
 //获取产品配件数据
 type GetFittingByPidReq {