From f39ca411103ee769936e7c09cc74c0fb2b6a5775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 9 Jun 2022 14:08:49 +0800
Subject: [PATCH] 1

---
 controllers/event.go | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/controllers/event.go b/controllers/event.go
index a10cf475c..75fba7de2 100644
--- a/controllers/event.go
+++ b/controllers/event.go
@@ -98,20 +98,31 @@ func (c *EventController) GetCheckVendorCookie() {
 // @router /GetWeixinUnlimited [post]
 func (c *EventController) GetWeixinUnlimited() {
 	c.callGetWeixinUnlimited(func(params *tEventGetWeixinUnlimitedParams) (retVal interface{}, errCode string, err error) {
-		var result map[string]interface{}
-		var fileName string
-		if params.MinType == model.WeChatQrCode {
-			result, err = api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page)
-			if err != nil || result == nil {
-				return retVal, "", err
-			}
-			fileName = "wxcode" + utils.Int64ToStr(time.Now().Unix()) + ".jpg"
-		} else {
-
+		result := make(map[string]interface{}, 2)
+		// 微信小程序二维码
+		weChatQr, err := api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page)
+		if err != nil || result == nil {
+			return retVal, "", err
 		}
+		fileName := "wxcode" + utils.Int64ToStr(time.Now().Unix()) + ".jpg"
+		weChatQrCode, err := jxutils.UploadExportContent([]byte(weChatQr["fakeData"].(string)), fileName)
+		if err != nil || result == nil {
+			return retVal, "", err
+		}
+		result["wxcode"] = weChatQrCode
+		// 抖音小程序二维码
+		tiktok, err := api.TiktokApi.GetTiktokQrCode(params.Scene)
+		if err != nil || result == nil {
+			return retVal, "", err
+		}
+		tiktokName := "tiktok" + utils.Int64ToStr(time.Now().Unix()) + ".jpg"
+		tiktokQrCode, err := jxutils.UploadExportContent([]byte(tiktok["fakeData"].(string)), tiktokName)
+		if err != nil || result == nil {
+			return retVal, "", err
+		}
+		result["tiktok"] = tiktokQrCode
 
-		retVal, err = jxutils.UploadExportContent([]byte(result["fakeData"].(string)), fileName)
-		return retVal, "", err
+		return result, "", err
 	})
 }