From 9916d13b7aed3e936d4c32b56a1da6434fe7b583 Mon Sep 17 00:00:00 2001
From: mofangmin <mofangmin@zh-games.com>
Date: Thu, 8 Aug 2024 17:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/web/handler/activity.go | 1 -
 modules/web/handler/share.go    | 2 +-
 modules/web/handler/withdraw.go | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/web/handler/activity.go b/modules/web/handler/activity.go
index b62790f..316ce1f 100644
--- a/modules/web/handler/activity.go
+++ b/modules/web/handler/activity.go
@@ -64,7 +64,6 @@ func GetUserTaskStatus(a *app.Gin) (ret []*values.OneTask) {
 						log.Error("GetUserTaskStatus err:%v", err)
 					}
 				}
-
 				break
 			}
 		}
diff --git a/modules/web/handler/share.go b/modules/web/handler/share.go
index 1e1e6b6..7b5ec82 100644
--- a/modules/web/handler/share.go
+++ b/modules/web/handler/share.go
@@ -106,7 +106,7 @@ func ShareInfo(c *gin.Context) {
 	resp.RechargeCount = call.GetUserShareRecharges(a.UID, 1)
 	resp.TotalRecharge = call.GetUserShareRechargeAmount(a.UID, 1)
 	if channel != nil {
-		resp.ShareLink = channel.URL + "?code=" + shareInfo.Share
+		resp.ShareLink = channel.URL + "?code=" + shareInfo.Share + "&ch=" + fmt.Sprintf("%d", channel.ChannelID)
 		if a.Prefix != "" {
 			resp.ShareLink = a.Prefix + "." + resp.ShareLink
 		} else {
diff --git a/modules/web/handler/withdraw.go b/modules/web/handler/withdraw.go
index ebac0fa..1e84aeb 100644
--- a/modules/web/handler/withdraw.go
+++ b/modules/web/handler/withdraw.go
@@ -355,10 +355,10 @@ func PlayerWithdraw(c *gin.Context) {
 
 	var shouldAuto = false
 	// 在总赠送比配置比例小时才判断个人
-	// if call.GetTotalRechargePer(realAmount) < config.GetConfig().Web.TotalWithdrawPer {
-	// 	// 直接发起退出
-	// 	shouldAuto = call.CanAutoWithdraw(uid, re.TotalRecharge, re.TotalWithdraw+re.TotalWithdrawing+realAmount)
-	// }
+	if call.GetTotalRechargePer(realAmount) < config.GetConfig().Web.TotalWithdrawPer {
+		// 直接发起退出
+		shouldAuto = call.CanAutoWithdraw(uid, re.TotalRecharge, re.TotalWithdraw+re.TotalWithdrawing+realAmount)
+	}
 	// 第二步，创建订单
 	withdrawChannel := -1
 	if req.ChannelID != nil {