From 64b25e4bcea0a1d6bf2f43d8b308aa241c8e4d92 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 29 Aug 2023 17:09:00 +0800
Subject: [PATCH 1/2] fix

---
 server/websocket/internal/logic/ws_render_image.go | 1 +
 utils/websocket_data/render_data.go                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go
index 395176d6..cd98c523 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -172,6 +172,7 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
 		Slogan:      renderImageData.RenderData.Slogan,
 		Address:     renderImageData.RenderData.Address,
 		Phone:       renderImageData.RenderData.Phone,
+		Qrcode:      renderImageData.RenderData.Qrcode,
 	}
 	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {
diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go
index 698981e0..a0ba0e98 100644
--- a/utils/websocket_data/render_data.go
+++ b/utils/websocket_data/render_data.go
@@ -20,6 +20,7 @@ type RenderData struct {
 	Slogan      string `json:"slogan"`       //slogan(可选)
 	Address     string `json:"address"`      //地址(可选)
 	Phone       string `json:"phone"`        //电话(可选)
+	Qrcode      string `json:"qrcode"`       //二维码(可选)
 	SizeId      int64  `json:"size_id"`      //尺寸id(可选,传值大于0则值返回刀版图不参与unity云渲染)
 	UserId      int64  `json:"user_id"`      //用户id(websocket连接建立再赋值)
 	GuestId     int64  `json:"guest_id"`     //游客id(websocket连接建立再赋值)

From 220e669ecab4fabaccb3217d55769464e69ace53 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 29 Aug 2023 17:10:58 +0800
Subject: [PATCH 2/2] fix

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

diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go
index cd98c523..99cc8a6e 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -173,6 +173,7 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
 		Address:     renderImageData.RenderData.Address,
 		Phone:       renderImageData.RenderData.Phone,
 		Qrcode:      renderImageData.RenderData.Qrcode,
+		LogoUrl:     renderImageData.RenderData.Logo,
 	}
 	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {