From bce88a3c2772a2bfa682ac8db880602ec341f223 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Fri, 8 Sep 2023 19:03:05 +0800 Subject: [PATCH] fix --- model/gmodel/fs_product_template_v2_logic.go | 2 +- server/websocket/internal/logic/ws_render_image.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/model/gmodel/fs_product_template_v2_logic.go b/model/gmodel/fs_product_template_v2_logic.go index c99314d1..bb657017 100755 --- a/model/gmodel/fs_product_template_v2_logic.go +++ b/model/gmodel/fs_product_template_v2_logic.go @@ -116,7 +116,7 @@ func (t *FsProductTemplateV2Model) GetProductTemplateListByParams(ctx context.Co // 获取开启云渲染模板 func (t *FsProductTemplateV2Model) FindOneCloudRenderByProductIdModelIdTemplateTag(ctx context.Context, productId, modelId int64, templateTag string) (resp *FsProductTemplateV2, err error) { err = t.db.WithContext(ctx).Model(&FsProductTemplateV2{}). - Where("product_id = ? and model_id = ? and template_tag = ? and element_model_id > ? ", productId, modelId, templateTag, 0). + Where("product_id = ? and model_id = ? and template_tag = ? ", productId, modelId, templateTag). Where("status = ? and is_del = ?", 1, 0). Order("sort ASC"). Take(&resp).Error diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index d1cc0405..6560a00c 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -286,6 +286,10 @@ func (w *wsConnectItem) getProductRelateionInfo(renderImageData websocket_data.R logx.Error("failed to get template info:", err) return nil, nil, nil, err } + if *productTemplate.ElementModelId <= 0 { + w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "模板未开启云渲染", renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3d.Id, productSize.Id, 0) + return nil, nil, nil, errors.New("模板未开启云渲染") + } if productTemplate.TemplateInfo == nil || *productTemplate.TemplateInfo == "" { w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "渲染模板的json设计信息是空的", renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3d.Id, productSize.Id, 0) return nil, nil, nil, errors.New("渲染模板的json设计信息是空的")