From 5c64d9772859ee6f9b3c03cc5189b90217556b8a Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 13 Dec 2024 17:42:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/scene.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worldsrv/scene.go b/worldsrv/scene.go index d28a99b..f6cef59 100644 --- a/worldsrv/scene.go +++ b/worldsrv/scene.go @@ -341,7 +341,10 @@ func (this *Scene) PlayerEnter(p *Player, pos int, ischangeroom bool) bool { //离场金币 leaverng := this.dbGameFree.GetRobotLimitCoin() if len(leaverng) >= 2 { - leaveCoin = leaverng[0] + rand.Int63n(leaverng[1]-leaverng[0]) + rangeValue := leaverng[1] - leaverng[0] + if rangeValue > 0 { + leaveCoin = leaverng[0] + rand.Int63n(rangeValue) + } } } From 7d6ee4c3bdfbc8660b855065e593a83ca50026e6 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 13 Dec 2024 17:51:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/trascate_webapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index 9a6fb83..d231bd4 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -2212,10 +2212,10 @@ func init() { WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/pay/CallbackPayment", WebAPIHandlerWrapper( func(tNode *transact.TransNode, params []byte) (int, proto.Message) { - logger.Logger.Tracef("api /api/pay/CallbackPayment") msg := &webapiproto.ASCallbackPayment{} pack := &webapiproto.SACallbackPayment{} err := proto.Unmarshal(params, msg) + logger.Logger.Trace("api /api/pay/CallbackPayment msg = ", msg) if err != nil { pack.Tag = webapiproto.TagCode_FAILED pack.Msg = "数据序列化失败" + err.Error() From db24cf06207a16e3cdf8d696b04033d97004f116 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 13 Dec 2024 17:53:13 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/trascate_webapi.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index d231bd4..85d76d1 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -2215,7 +2215,7 @@ func init() { msg := &webapiproto.ASCallbackPayment{} pack := &webapiproto.SACallbackPayment{} err := proto.Unmarshal(params, msg) - logger.Logger.Trace("api /api/pay/CallbackPayment msg = ", msg) + logger.Logger.Info("api /api/pay/CallbackPayment msg = ", msg) if err != nil { pack.Tag = webapiproto.TagCode_FAILED pack.Msg = "数据序列化失败" + err.Error() @@ -2262,6 +2262,7 @@ func init() { state = 3 } } + logger.Logger.Info("api /api/pay/CallbackPayment state = ", state) task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { err := model.UpdateDbShopState(msg.Platform, msg.OrderId, state) if err != nil { From a4ebed8fc937ebb60f01d2ee2e3caf33fddc4f2a Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 13 Dec 2024 17:54:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbproxy/svc/l_dbshoplog.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbproxy/svc/l_dbshoplog.go b/dbproxy/svc/l_dbshoplog.go index 6b25c0a..6a0e3e3 100644 --- a/dbproxy/svc/l_dbshoplog.go +++ b/dbproxy/svc/l_dbshoplog.go @@ -64,7 +64,7 @@ func (svc *DbShopLogSvc) UpdateDbShopState(args *model.DbShopLogArgs, ret *bool) logger.Logger.Error("UpdateDbShopState == nil") return nil } - logger.Logger.Trace("DbShopLogSvc.UpdateDbShopState") + logger.Logger.Info("DbShopLogSvc.UpdateDbShopState", args.Log.LogId) err = clog.UpdateId(args.Log.LogId, bson.M{"$set": bson.M{"state": args.Log.State}}) if err != nil { logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err) From d6bfa73d709fc23a4baa3782839010dbbd31406f Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 13 Dec 2024 17:55:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbproxy/svc/l_dbshoplog.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbproxy/svc/l_dbshoplog.go b/dbproxy/svc/l_dbshoplog.go index 6a0e3e3..f83343a 100644 --- a/dbproxy/svc/l_dbshoplog.go +++ b/dbproxy/svc/l_dbshoplog.go @@ -67,7 +67,7 @@ func (svc *DbShopLogSvc) UpdateDbShopState(args *model.DbShopLogArgs, ret *bool) logger.Logger.Info("DbShopLogSvc.UpdateDbShopState", args.Log.LogId) err = clog.UpdateId(args.Log.LogId, bson.M{"$set": bson.M{"state": args.Log.State}}) if err != nil { - logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err) + logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err, "LogId = ", args.Log.LogId) return nil } *ret = true From d791c4d02c4072093df79d01731881f4354c1b8d Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Mon, 16 Dec 2024 10:03:36 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=A1=A5=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/trascate_webapi.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index 85d76d1..de6d144 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -2257,7 +2257,8 @@ func init() { state = msg.GetState() player := PlayerMgrSington.GetPlayerBySnId(info.SnId) - if player == nil { + logger.Logger.Info("api /api/pay/CallbackPayment player = ", player) + if player == nil && !player.IsOnLine() { if info.State == 1 { state = 3 } From 8b40eb3c492ff86cdd645b7b868bc929ca7f92f0 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Mon, 16 Dec 2024 10:10:45 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=A1=A5=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/trascate_webapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index de6d144..2cc5e3d 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -2258,7 +2258,7 @@ func init() { state = msg.GetState() player := PlayerMgrSington.GetPlayerBySnId(info.SnId) logger.Logger.Info("api /api/pay/CallbackPayment player = ", player) - if player == nil && !player.IsOnLine() { + if player == nil || (player != nil && !player.IsOnLine()) { if info.State == 1 { state = 3 } From 4d65851083ada20e2fbf3f2f2d998c4cf71835da Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Mon, 16 Dec 2024 10:16:55 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=A1=A5=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/trascate_webapi.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index 2cc5e3d..53cdd40 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -2257,13 +2257,11 @@ func init() { state = msg.GetState() player := PlayerMgrSington.GetPlayerBySnId(info.SnId) - logger.Logger.Info("api /api/pay/CallbackPayment player = ", player) - if player == nil || (player != nil && !player.IsOnLine()) { - if info.State == 1 { + if player == nil { + if msg.State == 1 { state = 3 } } - logger.Logger.Info("api /api/pay/CallbackPayment state = ", state) task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { err := model.UpdateDbShopState(msg.Platform, msg.OrderId, state) if err != nil {