首充更改

放开大盘提现控制

call/pay.go

@@ -249,9 +249,15 @@ func RechargeCallback(r *common.RechargeOrder, success bool, payAccount, extra s
 		// if per > 0 {
 		// 	bonus = amount * per / 100
 		// }
-		needBet := GetConfigCurrencyResourceNeedBet(common.CurrencyResourceRecharge, amount)
+		t := common.CurrencyResourceRecharge
+		if notCharge && bonus > 0 { // 首充
+			t = common.CurrencyResourceFirstRecharge
+		} else if bonus > 0 {
+			t = common.CurrencyResourceRechargeBonus
+		}
+		needBet := GetConfigCurrencyResourceNeedBet(t, amount)
 		if bonus > 0 {
-			needBet = GetConfigCurrencyResourceNeedBet(common.CurrencyResourceRechargeBonus, amount+bonus)
+			needBet = GetConfigCurrencyResourceNeedBet(t, amount+bonus)
 		}
 		cb := &common.CurrencyBalance{
 			UID:     r.UID,

common/currency.go

@@ -27,6 +27,7 @@ const (
 	CurrencyResourceRecharge                  // 一般充值
 	CurrencyResourceBonus                     // 额外赠送
 	CurrencyResourceRechargeBonus             // bonus充值
+	CurrencyResourceFirstRecharge             // 首充
 	CurrencyResourceAll
 )
 

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 {