From 90229ca23ef85fd6803ae00791bac81d26d1cdd3 Mon Sep 17 00:00:00 2001
From: Hiven <hivenmeng@163.com>
Date: Tue, 15 Aug 2023 11:20:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=87=8D=E6=9E=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/internal/logic/logocombinelogic.go |  1 +
 server/resource/internal/types/types.go            |  1 +
 server_api/resource.api                            |  1 +
 service/repositories/image_handle.go               | 10 ++++++----
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go
index 72468f8e..661228e3 100644
--- a/server/resource/internal/logic/logocombinelogic.go
+++ b/server/resource/internal/logic/logocombinelogic.go
@@ -65,6 +65,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		Slogan:      req.Slogan,
 		Phone:       req.Phone,
 		Address:     req.Address,
+		Qrcode:      req.Qrcode,
 	})
 
 	if err != nil {
diff --git a/server/resource/internal/types/types.go b/server/resource/internal/types/types.go
index f397f7b7..f32c5505 100644
--- a/server/resource/internal/types/types.go
+++ b/server/resource/internal/types/types.go
@@ -17,6 +17,7 @@ type LogoCombineReq struct {
 	Slogan      string `form:"slogan,optional"`  // 合图参数
 	Address     string `form:"address,optional"` // 合图参数
 	Phone       string `form:"phone,optional"`   // 合图参数
+	Qrcode      string `form:"qrcode,optional"`  // 合图参数
 }
 
 type Request struct {
diff --git a/server_api/resource.api b/server_api/resource.api
index 33cf915b..89423498 100644
--- a/server_api/resource.api
+++ b/server_api/resource.api
@@ -32,5 +32,6 @@ type (
 		Slogan      string `form:"slogan,optional"`  // 合图参数
 		Address     string `form:"address,optional"` // 合图参数
 		Phone       string `form:"phone,optional"`   // 合图参数
+		Qrcode      string `form:"qrcode,optional"`  // 合图参数
 	}
 )
\ No newline at end of file
diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go
index 574683ac..02292984 100644
--- a/service/repositories/image_handle.go
+++ b/service/repositories/image_handle.go
@@ -47,10 +47,11 @@ type (
 		GuestId     int64  `json:"guest_id"`
 		TemplateId  int64  `json:"template_id"`
 		TemplateTag string `json:"resource_key"`
-		Website     string `form:"website,optional"` // 合图参数
-		Slogan      string `form:"slogan,optional"`  // 合图参数
-		Address     string `form:"address,optional"` // 合图参数
-		Phone       string `form:"phone,optional"`   // 合图参数
+		Website     string `json:"website"` // 合图参数
+		Slogan      string `json:"slogan"`  // 合图参数
+		Address     string `json:"address"` // 合图参数
+		Phone       string `json:"phone"`   // 合图参数
+		Qrcode      string `json:"qrcode"`  // 合图参数
 	}
 	LogoCombineRes struct {
 		ResourceId  string
@@ -131,6 +132,7 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	combineParam["slogan"] = in.Slogan
 	combineParam["phone"] = in.Phone
 	combineParam["address"] = in.Address
+	combineParam["qrcode"] = in.Qrcode
 
 	var postMap = make(map[string]interface{}, 2)
 	postMap["module_data"] = moduleDataMap