tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
sk 2024-12-16 11:17:11 +08:00
parent 5ca1048b18 4d65851083
commit bcbc162549
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbproxy/svc/l_dbshoplog.go
View File

@ -64,10 +64,10 @@ func (svc *DbShopLogSvc) UpdateDbShopState(args *model.DbShopLogArgs, ret *bool)
logger.Logger.Error("UpdateDbShopState == nil") logger.Logger.Error("UpdateDbShopState == nil")
return 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}}) err = clog.UpdateId(args.Log.LogId, bson.M{"$set": bson.M{"state": args.Log.State}})
if err != nil { if err != nil {
logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err) logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err, "LogId = ", args.Log.LogId)
return nil return nil
} }
*ret = true *ret = true

4
worldsrv/trascate_webapi.go
View File

@ -2212,10 +2212,10 @@ func init() {
WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/pay/CallbackPayment", WebAPIHandlerWrapper( WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/pay/CallbackPayment", WebAPIHandlerWrapper(
func(tNode *transact.TransNode, params []byte) (int, proto.Message) { func(tNode *transact.TransNode, params []byte) (int, proto.Message) {
logger.Logger.Tracef("api /api/pay/CallbackPayment")
msg := &webapiproto.ASCallbackPayment{} msg := &webapiproto.ASCallbackPayment{}
pack := &webapiproto.SACallbackPayment{} pack := &webapiproto.SACallbackPayment{}
err := proto.Unmarshal(params, msg) err := proto.Unmarshal(params, msg)
logger.Logger.Info("api /api/pay/CallbackPayment msg = ", msg)
if err != nil { if err != nil {
pack.Tag = webapiproto.TagCode_FAILED pack.Tag = webapiproto.TagCode_FAILED
pack.Msg = "数据序列化失败" + err.Error() pack.Msg = "数据序列化失败" + err.Error()
@ -2258,7 +2258,7 @@ func init() {
state = msg.GetState() state = msg.GetState()
player := PlayerMgrSington.GetPlayerBySnId(info.SnId) player := PlayerMgrSington.GetPlayerBySnId(info.SnId)
if player == nil { if player == nil {
if info.State == 1 { if msg.State == 1 {
state = 3 state = 3
} }
} }