Merge branch 'release' into dev

common/activity.go

@@ -566,7 +566,7 @@ type ConfigRtp struct {
 	ID          int   `gorm:"column:id;type:int(11) AUTO_INCREMENT;primary_key"`
 	MinRecharge int64 `gorm:"column:min_recharge;type:bigint(20);comment:最小充值"  web:"min_recharge"`
 	MaxRecharge int64 `gorm:"column:max_recharge;type:bigint(20);comment:最小充值"  web:"max_recharge"`
-	Rtp         int   `gorm:"column:rtp;type:int(11);comment:rtp" json:"rtp" web:"rtp"`
+	Rtp         int   `gorm:"column:rtp;type:int(11);comment:rtp"  web:"rtp"`
 	EnterPer    int   `gorm:"column:enter_per;type:int(11);comment:进入提存比"  web:"enter_per"`
 	ExitPer     int   `gorm:"column:exit_per;type:int(11);comment:退出提存比"  web:"exit_per"`
 }

modules/backend/handler/guser/editGameUserGold.go

@@ -51,12 +51,19 @@ func EditGameUserRtp(c *gin.Context) {
 	if !a.S(req) {
 		return
 	}
-	err := db.Mysql().Update(&common.PlayerRtpData{Uid: req.UID}, map[string]interface{}{
+	rtpData := &common.PlayerRtpData{Uid: req.UID}
-		"rtp": req.Val,
+	db.Mysql().Get(rtpData)
-	})
+	if rtpData.Id == 0 {
-	if err != nil {
+		rtpData.Rtp = req.Val
-		a.Code = values.CodeRetry
+		db.Mysql().Create(rtpData)
-		a.Msg = "modify rtp error"
+	} else {
+		err := db.Mysql().Update(&common.PlayerRtpData{Uid: req.UID}, map[string]interface{}{
+			"rtp": req.Val,
+		})
+		if err != nil {
+			a.Code = values.CodeRetry
+			a.Msg = "modify rtp error"
+		}
 	}
 
 	a.RecordEdit(values.PowerGUser, fmt.Sprintf("修改玩家%vRtp:%v", req.UID, req.Val))

modules/backend/handler/guser/getGameUserInfo.go

@@ -93,13 +93,7 @@ func GetGameUserInfo(c *gin.Context) {
 	// usdtInfo := call.GetPlayerRechargeInfoByCurrency(uid, common.CurrencyUSDT)
 	resp.RechargeBrl = brlInfo.TotalRecharge
 	resp.WithdrawBrl = brlInfo.TotalWithdraw
-	rtp := call.GetUserRtp(uid)
+	resp.Rtp, _ = db.Redis().GetInt(common.GetRedisKeyPlayerRtp(uid))
-	if rtp.Id == 0 {
-		db.Mysql().Create(rtp)
-		rtp.Rtp, _ = db.Redis().GetInt(common.GetRedisKeyPlayerRtp(uid))
-	} else {
-		resp.Rtp = rtp.Rtp
-	}
 	// resp.RechargeUsdt = usdtInfo.TotalRecharge
 	// resp.WithdrawUsdt = usdtInfo.TotoalWithdraw