From e2f9f44701e89059da39dece9a360468bd7555cb Mon Sep 17 00:00:00 2001 From: mofangmin Date: Wed, 10 Jul 2024 14:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=88=B7=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- call/pay.go | 2 +- call/statistics.go | 6 +++--- modules/backend/handler/common/common.go | 10 +++++++--- modules/pay/moonpay2/base.go | 4 ++++ modules/web/handler/firstpage.go | 19 +++++++++++++++---- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/call/pay.go b/call/pay.go index edec42a..a4074c8 100644 --- a/call/pay.go +++ b/call/pay.go @@ -284,7 +284,7 @@ func RechargeCallback(r *common.RechargeOrder, success bool, payAccount, extra s // 24小时内注册的用户所有付费事件上报 if now-user.Birth <= 24*60*60 { uploads = append(uploads, func() { - UploadAdjust(common.AdjustEventNewPay, user, map[string]string{"revenue": util.RoundFloat(float64(amount/1e6)/100, 2), "currency": "INR"}) + UploadAdjust(common.AdjustEventNewPay, user, map[string]string{"revenue": util.RoundFloat(float64(amount)/100, 2), "currency": "INR"}) }) // 上报fb diff --git a/call/statistics.go b/call/statistics.go index aff0bb6..a42a749 100644 --- a/call/statistics.go +++ b/call/statistics.go @@ -174,7 +174,7 @@ func UploadFB(uid int, event FBEvent, amount int64) { events[0].UserData.ZP = zp events[0].ActionSource = "website" if event == FBEventPurchase { - events[0].CustomData.Currency = "brl" + events[0].CustomData.Currency = "inr" events[0].CustomData.Value = amount } @@ -560,8 +560,8 @@ func UploadKwai(uid, event int, amount int64) { } if event == KwaiEventPay { pro := &KwaiProperties{ - Currency: "brl", - Price: float64(amount/1e6) / 100, + Currency: "inr", + Price: float64(amount) / 100, } byt, _ := json.Marshal(pro) send.Properties = string(byt) diff --git a/modules/backend/handler/common/common.go b/modules/backend/handler/common/common.go index b4bee26..c68c9f5 100644 --- a/modules/backend/handler/common/common.go +++ b/modules/backend/handler/common/common.go @@ -9,6 +9,7 @@ import ( "server/modules/backend/bdb" "server/modules/backend/values" "server/util" + "strings" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/gin-gonic/gin" @@ -92,7 +93,10 @@ func UploadOSS(c *gin.Context) { ossConf := config.GetConfig().Backend.Oss req := new(values.UploadOSSReq) req.ObjectName = c.PostForm("ObjectName") - req.Folder = c.PostForm("Folder") + req.Folder = c.PostForm("folder") + if req.Folder != "" && !strings.HasSuffix(req.Folder, "/") { + req.Folder += "/" + } rsp := new(values.UploadOSSResp) a.Data = rsp file, err := c.FormFile("file") @@ -122,11 +126,11 @@ func UploadOSS(c *gin.Context) { return } } - err = bucket.PutObject(req.Folder+ossConf.ObjectName+file.Filename, f) + err = bucket.PutObject(ossConf.ObjectName+req.Folder+file.Filename, f) if err != nil { a.Code = values.CodeRetry log.Error("UploadOSS PutObject err:%v", err) return } - rsp.Url = fmt.Sprintf("https://%s/%s", ossConf.Domain, req.Folder+ossConf.ObjectName+file.Filename) + rsp.Url = fmt.Sprintf("https://%s/%s", ossConf.Domain, ossConf.ObjectName+req.Folder+file.Filename) } diff --git a/modules/pay/moonpay2/base.go b/modules/pay/moonpay2/base.go index 9ff5c57..5a06a55 100644 --- a/modules/pay/moonpay2/base.go +++ b/modules/pay/moonpay2/base.go @@ -159,6 +159,10 @@ func (s *Sub) PackPayReq() interface{} { func (s *Sub) PackWithdrawReq() interface{} { r := s.Base.WithdrawReq + if len(r.Phone) == 12 { + r.Phone = r.Phone[2:] + } + r.Amount /= 100 send := &WithdrawReq{ MerchantID: mid, OrderNumber: r.OrderID, diff --git a/modules/web/handler/firstpage.go b/modules/web/handler/firstpage.go index a43ee58..6c228c8 100644 --- a/modules/web/handler/firstpage.go +++ b/modules/web/handler/firstpage.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "math/rand" "server/call" "server/common" "server/db" @@ -57,15 +58,25 @@ func FirstPage(c *gin.Context) { ConfigFirstPageGames: v, List: make([]*common.ConfigGameList, 0), } - if v.Name == "Recent" { + if strings.ToLower(v.Name) == "recent" { one.List = append(one.List, call.GetGameRecord(a.UID)...) - } else if v.Name == "Favorite" { + } else if strings.ToLower(v.Name) == "favorite" { one.List = append(one.List, call.GetPlayerFavoriteList(a.UID)...) } else { + gameNum := req.GameNum + if strings.ToLower(v.Name) == "hot" { + gameNum = 100 + } if v.JumpType == 1 { - one.List = call.GetConfigGameList(req.GameNum, v.JumpID) + one.List = call.GetConfigGameList(gameNum, v.JumpID) } else { - one.List = call.GetConfigGameList(req.GameNum, 0, v.JumpID) + one.List = call.GetConfigGameList(gameNum, 0, v.JumpID) + } + if gameNum != req.GameNum { + rand.Shuffle(len(one.List), func(i, j int) { + one.List[i], one.List[j] = one.List[j], one.List[i] + }) + one.List = one.List[:req.GameNum] } } call.GetGameInfo(one.List)