From 5af797eeaeb31f59077031292c3c7e9c7a827e09 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 18 Aug 2023 16:58:30 +0800
Subject: [PATCH 1/2] fix

---
 server/websocket/internal/logic/ws_render_image_logic.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/websocket/internal/logic/ws_render_image_logic.go b/server/websocket/internal/logic/ws_render_image_logic.go
index 69cac32f..e0a294ec 100644
--- a/server/websocket/internal/logic/ws_render_image_logic.go
+++ b/server/websocket/internal/logic/ws_render_image_logic.go
@@ -185,7 +185,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
 		logx.Error("合成刀版图失败,合成的刀版图是空指针:", err)
 		return err
 	}
-	logx.Info("合成刀版图成功,原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl)
+	logx.Info("合成刀版图成功,模板id：", productTemplate.Id, ",原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl)
 	//获取渲染设置信息
 	element, err := w.logic.svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(w.logic.ctx, *productTemplate.ModelId)
 	if err != nil {

From 4f1bb51d8f8d3ca2255de9df23d0d9200d5925e8 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 18 Aug 2023 17:08:56 +0800
Subject: [PATCH 2/2] fix

---
 server/websocket/internal/logic/ws_render_image_logic.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/websocket/internal/logic/ws_render_image_logic.go b/server/websocket/internal/logic/ws_render_image_logic.go
index e0a294ec..f1ef8386 100644
--- a/server/websocket/internal/logic/ws_render_image_logic.go
+++ b/server/websocket/internal/logic/ws_render_image_logic.go
@@ -164,7 +164,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
 		return err
 	}
 	//获取刀版图
-	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &repositories.LogoCombineReq{
+	combineReq := repositories.LogoCombineReq{
 		UserId:      info.RenderData.UserId,
 		GuestId:     info.RenderData.GuestId,
 		TemplateId:  productTemplate.Id,
@@ -173,7 +173,8 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
 		Slogan:      info.RenderData.Slogan,
 		Address:     info.RenderData.Address,
 		Phone:       info.RenderData.Phone,
-	})
+	}
+	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {
 		logx.Error("合成刀版图失败:", err)
 		return err
@@ -185,7 +186,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
 		logx.Error("合成刀版图失败,合成的刀版图是空指针:", err)
 		return err
 	}
-	logx.Info("合成刀版图成功,模板id：", productTemplate.Id, ",原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl)
+	logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",模板id：", productTemplate.Id, ",原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl)
 	//获取渲染设置信息
 	element, err := w.logic.svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(w.logic.ctx, *productTemplate.ModelId)
 	if err != nil {