From 7f23905e768a4242b8ad61a46802b50e6c84434d Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Wed, 23 Aug 2023 11:24:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A3=81=E5=89=AA=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../internal/logic/logocombinelogic.go        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go
index 4679ee5e..53b02768 100644
--- a/server/resource/internal/logic/logocombinelogic.go
+++ b/server/resource/internal/logic/logocombinelogic.go
@@ -45,22 +45,22 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		return resp.SetStatus(basic.CodeUnAuth)
 	}
 
-	// var userId int64
-	// var guestId int64
+	var userId int64
+	var guestId int64
 
-	// // 检查用户是否是游客
-	// if userinfo.IsGuest() {
-	// 	// 如果是，使用游客ID和游客键名格式
-	// 	guestId = userinfo.GuestId
-	// } else {
-	// 	// 否则，使用用户ID和用户键名格式
-	// 	userId = userinfo.UserId
-	// }
+	// 检查用户是否是游客
+	if userinfo.IsGuest() {
+		// 如果是，使用游客ID和游客键名格式
+		guestId = userinfo.GuestId
+	} else {
+		// 否则，使用用户ID和用户键名格式
+		userId = userinfo.UserId
+	}
 	res, err := l.svcCtx.Repositories.ImageHandle.LogoCombine(l.ctx, &repositories.LogoCombineReq{
-		UserId:      0,
-		GuestId:     36,
-		TemplateId:  569,
-		TemplateTag: "b1a",
+		UserId:      userId,
+		GuestId:     guestId,
+		TemplateId:  req.TemplateId,
+		TemplateTag: req.TemplateTag,
 		Website:     req.Website,
 		Slogan:      req.Slogan,
 		Phone:       req.Phone,