From 6beec9638a907f0c575725b9de7943983c93e1a2 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 2 Jan 2024 15:53:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=8B=E7=82=B9=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 1 + comm/imodule.go | 10 ++--- modules/achieve/api_Info.go | 2 +- modules/achieve/api_award.go | 2 +- modules/buried/api_send.go | 3 +- modules/buried/modelburied.go | 14 ++++++ modules/buried/module.go | 61 ++++++++++++++++++++------- modules/combat/api_ask.go | 4 +- modules/gm/module.go | 2 +- modules/growtask/api_tasklist.go | 2 +- modules/growtask/model_growtask.go | 7 +-- modules/integral/api_reward.go | 2 +- modules/integral/model_integral.go | 5 ++- modules/integral/module.go | 2 +- modules/mainline/api_taskreceive.go | 2 +- modules/moonlv/api_receive.go | 2 +- modules/moonlv/model_moonlv.go | 5 ++- modules/moonlv/module.go | 2 +- modules/pushgiftbag/module.go | 2 +- modules/sociaty/api_cross_agree.go | 4 +- modules/sociaty/api_cross_apply.go | 2 +- modules/sociaty/api_cross_create.go | 2 +- modules/sociaty/api_cross_mine.go | 2 +- modules/sociaty/api_cross_tasklist.go | 2 +- modules/sociaty/model_sociaty.go | 10 +++-- modules/sociaty/model_sociatytask.go | 5 ++- modules/warorder/api_info.go | 4 +- 27 files changed, 106 insertions(+), 55 deletions(-) diff --git a/comm/const.go b/comm/const.go index 4e1498dfb..0c7e81b08 100644 --- a/comm/const.go +++ b/comm/const.go @@ -1181,4 +1181,5 @@ const ( const ( Session_User = "user" Session_UserExpand = "userexpand" + Session_Buried = "buried" ) diff --git a/comm/imodule.go b/comm/imodule.go index 0e7e0b7d0..5054c79f1 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -550,17 +550,17 @@ type ( //埋点中心 IBuried interface { //完成任务埋点 - CompleteCondition(uid string, condiId int32) (err error) + CompleteCondition(session IUserSession, condiId int32) (err error) //埋点中心触发 TriggerBuried(session IUserSession, burieds ...*pb.BuriedParam) //校验条件是否达成 返回未完成列表 - CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) + CheckCondition(session IUserSession, condiIds ...int32) (condis []*pb.ConIProgress, err error) //激活条件 - ActiveCondition(uid string, condiIds ...int32) (errdata *pb.ErrorData) + ActiveCondition(session IUserSession, condiIds ...int32) (errdata *pb.ErrorData) //完成任务并校验接口 - FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) + FinishConditionAndCheck(session IUserSession, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) //重置埋点 按类型 - ResetBuriedByType(uid string, types ...TaskType) (err error) + ResetBuriedByType(session IUserSession, types ...TaskType) (err error) } //红点模块接口 IReddot interface { diff --git a/modules/achieve/api_Info.go b/modules/achieve/api_Info.go index 7cbbe9f26..8cd22f845 100644 --- a/modules/achieve/api_Info.go +++ b/modules/achieve/api_Info.go @@ -31,7 +31,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.AchieveInfoReq) (er return } tasks = this.module.configure.tasksConf - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), diff --git a/modules/achieve/api_award.go b/modules/achieve/api_award.go index 8b3ef33e6..5a5ebf016 100644 --- a/modules/achieve/api_award.go +++ b/modules/achieve/api_award.go @@ -52,7 +52,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AchieveAwardReq) ( return } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.TaskBuried); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.TaskBuried); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), diff --git a/modules/buried/api_send.go b/modules/buried/api_send.go index 466c35648..cbf925508 100644 --- a/modules/buried/api_send.go +++ b/modules/buried/api_send.go @@ -27,7 +27,7 @@ func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedIn return } - if condis, err = this.module.CheckCondition(session.GetUserId(), req.Conditions...); err != nil { + if condis, err = this.module.CheckCondition(session, req.Conditions...); err != nil { this.module.Error("查询埋点进度错误!", log.Field{Key: "err", Value: err.Error()}) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -36,7 +36,6 @@ func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedIn } return } - session.SendMsg(string(this.module.GetType()), "inquireprogress", &pb.BuriedInquireProgressResp{Conditions: condis}) return } diff --git a/modules/buried/modelburied.go b/modules/buried/modelburied.go index 66c7efd99..be5599243 100644 --- a/modules/buried/modelburied.go +++ b/modules/buried/modelburied.go @@ -112,3 +112,17 @@ func (this *buriedModel) updateUserBurieds(uid string, data *pb.DBBuried) (err e func (this *buriedModel) userlock(uid string) (result *redis.RedisMutex, err error) { return this.model.Redis.NewRedisMutex(fmt.Sprintf("ulockburied:%s", uid)) } + +//获取埋点数据 +func (this *buriedModel) getSessionBuried(session comm.IUserSession) (bdatas *pb.DBBuried, err error) { + if ok, mate := session.GetMate(comm.Session_Buried); ok { + bdatas = mate.(*pb.DBBuried) + return + } else { + if bdatas, err = this.getUserBurieds(session.GetUserId()); err != nil { + return + } + session.SetMate(comm.Session_Buried, bdatas) + return + } +} diff --git a/modules/buried/module.go b/modules/buried/module.go index 65ef01481..54a4a4488 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -91,8 +91,9 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, req *pb.Rpc_Mod } //完成任务 -func (this *Buried) CompleteCondition(uid string, condiId int32) (err error) { +func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32) (err error) { var ( + uid string model *buriedModel bdatas *pb.DBBuried bitem *pb.DBBuriedConItem @@ -100,14 +101,13 @@ func (this *Buried) CompleteCondition(uid string, condiId int32) (err error) { ok bool bdata *pb.DBBuriedItem ) - + uid = session.GetUserId() if model, err = this.modelBuried.getburiedModel(uid); err != nil { return } - if bdatas, err = model.getUserBurieds(uid); err != nil { + if bdatas, err = model.getSessionBuried(session); err != nil { return } - this.Debug("完成埋点!", log.Field{Key: "condiId", Value: condiId}) lock, _ := model.userlock(uid) err = lock.Lock() @@ -174,8 +174,9 @@ func (this *Buried) CompleteCondition(uid string, condiId int32) (err error) { } // 激活数据采集点 -func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (errdata *pb.ErrorData) { +func (this *Buried) ActiveCondition(session comm.IUserSession, condiIds ...int32) (errdata *pb.ErrorData) { var ( + uid string conf *cfg.GameBuriedCondiData bdatas *pb.DBBuried model *buriedModel @@ -184,6 +185,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (errdata *pb. chanage bool err error ) + uid = session.GetUserId() if model, err = this.modelBuried.getburiedModel(uid); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -221,7 +223,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (errdata *pb. continue } if bdatas == nil { //放在后面 可以减少网络io - if bdatas, err = model.getUserBurieds(uid); err != nil { + if bdatas, err = model.getSessionBuried(session); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.String(), @@ -271,14 +273,16 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (errdata *pb. } // 重置所有对应的子任务 按埋点类型 -func (this *Buried) ResetBuriedByType(uid string, types ...comm.TaskType) (err error) { +func (this *Buried) ResetBuriedByType(session comm.IUserSession, types ...comm.TaskType) (err error) { var ( + uid string bdatas *pb.DBBuried model *buriedModel bdata *pb.DBBuriedItem ok bool chanage bool ) + uid = session.GetUserId() if model, err = this.modelBuried.getburiedModel(uid); err != nil { return } @@ -290,7 +294,7 @@ func (this *Buried) ResetBuriedByType(uid string, types ...comm.TaskType) (err e return } defer lock.Unlock() - if bdatas, err = model.getUserBurieds(uid); err != nil { + if bdatas, err = model.getSessionBuried(session); err != nil { return } for _, v := range types { @@ -313,18 +317,20 @@ func (this *Buried) ResetBuriedByType(uid string, types ...comm.TaskType) (err e } // 激活数据采集点 -func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) { +func (this *Buried) CheckCondition(session comm.IUserSession, condiIds ...int32) (condis []*pb.ConIProgress, err error) { var ( + uid string model *buriedModel bdatas *pb.DBBuried conf *cfg.GameBuriedCondiData bdata *pb.DBBuriedItem ok bool ) + uid = session.GetUserId() if model, err = this.modelBuried.getburiedModel(uid); err != nil { return } - if bdatas, err = model.getUserBurieds(uid); err != nil { + if bdatas, err = model.getSessionBuried(session); err != nil { return } condis = make([]*pb.ConIProgress, 0) @@ -378,8 +384,9 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb. } // 设置任务完成状态并校验 -func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) { +func (this *Buried) FinishConditionAndCheck(session comm.IUserSession, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) { var ( + uid string model *buriedModel bdatas *pb.DBBuried bitem *pb.DBBuriedConItem @@ -388,11 +395,11 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, chanage bool bdata *pb.DBBuriedItem ) - + uid = session.GetUserId() if model, err = this.modelBuried.getburiedModel(uid); err != nil { return } - if bdatas, err = model.getUserBurieds(uid); err != nil { + if bdatas, err = model.getSessionBuried(session); err != nil { return } @@ -567,6 +574,7 @@ func (this *Buried) TriggerBuried(session comm.IUserSession, burieds ...*pb.Buri func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedParam) { var ( + model *buriedModel pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData) bconf *cfg.GameBuriedTypeData bdatas *pb.DBBuried @@ -580,9 +588,12 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara nmodule comm.IBuriedUpdateNotify err error ) + if model, err = this.modelBuried.getburiedModel(session.GetUserId()); err != nil { + return + } this.Debug("触发埋点!", log.Field{Key: "burieds", Value: burieds}) - lock, _ := this.modelBuried.userlock(session.GetUserId()) + lock, _ := model.userlock(session.GetUserId()) err = lock.Lock() if err != nil { this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: err.Error()}) @@ -607,8 +618,13 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara } } if len(pass) > 0 { - if bdatas, err = this.modelBuried.getUserBurieds(session.GetUserId()); err != nil { + if ok, mate := session.GetMate(comm.Session_Buried); ok { + bdatas = mate.(*pb.DBBuried) return + } else { + if bdatas, err = model.getSessionBuried(session); err != nil { + return + } } } notify = make(map[string][]*pb.ConIProgress) @@ -666,7 +682,7 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara } if len(changes) > 0 { //同步数据 - if err = this.modelBuried.updateUserBurieds(session.GetUserId(), bdatas); err != nil { + if err = model.updateUserBurieds(session.GetUserId(), bdatas); err != nil { this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()}) return } @@ -843,3 +859,16 @@ func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTyp efficient = true return } + +//获取埋点数据 +func (this *Buried) getburied(session comm.IUserSession) (bdatas *pb.DBBuried, err error) { + if ok, mate := session.GetMate(comm.Session_Buried); ok { + bdatas = mate.(*pb.DBBuried) + return + } else { + if bdatas, err = this.modelBuried.getUserBurieds(session.GetUserId()); err != nil { + return + } + return + } +} diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index edb8541ff..0f7109f09 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -66,7 +66,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda if level.Pass != 2 { level.Progress = 0 - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Maintask...); err != nil { + if condis, err = this.module.ModuleBuried.CheckCondition(session, lvconf.Maintask...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), @@ -102,7 +102,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda pitem.Mainaward = atns } - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil { + if condis, err = this.module.ModuleBuried.CheckCondition(session, lvconf.Subtask...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), diff --git a/modules/gm/module.go b/modules/gm/module.go index 577fc6465..e4d7f3563 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -695,7 +695,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } - module1.(comm.IBuried).CompleteCondition(session.GetUserId(), int32(condiId)) + module1.(comm.IBuried).CompleteCondition(session, int32(condiId)) this.Debug("使用bingo命令:uid = %s ", log.Field{Key: "uid", Value: session.GetUserId()}, diff --git a/modules/growtask/api_tasklist.go b/modules/growtask/api_tasklist.go index 7015bd5c7..507f46b6c 100644 --- a/modules/growtask/api_tasklist.go +++ b/modules/growtask/api_tasklist.go @@ -33,7 +33,7 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (e return } - g, curTaskId := this.module.modelGrowtask.list(uid, req.TaskType, gt) + g, curTaskId := this.module.modelGrowtask.list(session, req.TaskType, gt) rsp := &pb.GrowtaskListResp{ TaskList: g, CurTaskType: gt.CurTaskType, diff --git a/modules/growtask/model_growtask.go b/modules/growtask/model_growtask.go index 3614aa64c..52077fa01 100644 --- a/modules/growtask/model_growtask.go +++ b/modules/growtask/model_growtask.go @@ -85,13 +85,14 @@ func (this *ModelGrowtask) getUserGrowtask(uid string) (*pb.DBGrowtask, error) { } // 任务列表 -func (this *ModelGrowtask) list(uid string, taskType int32, gt *pb.DBGrowtask) ([]*pb.Growtask, int32) { +func (this *ModelGrowtask) list(session comm.IUserSession, taskType int32, gt *pb.DBGrowtask) ([]*pb.Growtask, int32) { var ( + uid string curList []*pb.Growtask curTaskId int32 ) - + uid = session.GetUserId() getList := func(list []*pb.Growtask) []*pb.Growtask { taskStatusMap := make(map[int32]pb.GrowtaskStatus) //任务状态 for _, v := range list { @@ -114,7 +115,7 @@ func (this *ModelGrowtask) list(uid string, taskType int32, gt *pb.DBGrowtask) ( } //任务完成 - if _, err := this.moduleGrowtask.ModuleBuried.CheckCondition(uid, v.Fstask); err == nil { + if _, err := this.moduleGrowtask.ModuleBuried.CheckCondition(session, v.Fstask); err == nil { if v.PreTask == 0 { v.Status = pb.GrowtaskStatus_Wait //待领奖状态 } else { diff --git a/modules/integral/api_reward.go b/modules/integral/api_reward.go index 8812abf2a..920220a34 100644 --- a/modules/integral/api_reward.go +++ b/modules/integral/api_reward.go @@ -27,7 +27,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.IntegralGetRew atno []*pb.UserAtno ) update := make(map[string]interface{}) - list, err = this.module.modelIntegral.getIntegralList(session.GetUserId()) + list, err = this.module.modelIntegral.getIntegralList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/integral/model_integral.go b/modules/integral/model_integral.go index 56b70ba6b..5bb09af1e 100644 --- a/modules/integral/model_integral.go +++ b/modules/integral/model_integral.go @@ -45,7 +45,8 @@ func (this *modelIntegral) queryPlayers(uIds []string) (result []*pb.DBIntegralB } // 获取列表信息 -func (this *modelIntegral) getIntegralList(uid string) (result *pb.DBIntegralBoss, err error) { +func (this *modelIntegral) getIntegralList(session comm.IUserSession) (result *pb.DBIntegralBoss, err error) { + uid := session.GetUserId() result = &pb.DBIntegralBoss{} if err = this.Get(uid, result); mgo.MongodbNil == err { result.Id = primitive.NewObjectID().Hex() @@ -78,7 +79,7 @@ func (this *modelIntegral) getIntegralList(uid string) (result *pb.DBIntegralBos for _, v := range this.module.configure.GetIntegralCondition() { szTaskid = append(szTaskid, v.TaskId) // 获取任务id } - if data, err := this.module.ModuleBuried.CheckCondition(uid, szTaskid...); err == nil { + if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil { for _, v := range data { if v.State == pb.BuriedItemFinishState_buried_finish { diff --git a/modules/integral/module.go b/modules/integral/module.go index 635989379..4f4b062f6 100644 --- a/modules/integral/module.go +++ b/modules/integral/module.go @@ -62,7 +62,7 @@ func (this *Integral) OnInstallComp() { func (this *Integral) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIProgress) { var bChange bool this.Debug("积分boss条件达成通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "conds", Value: conds}) - dt, err := this.modelIntegral.getIntegralList(session.GetUserId()) + dt, err := this.modelIntegral.getIntegralList(session) if dt.Itype != 2 { // 只有事件模式才有debuff return diff --git a/modules/mainline/api_taskreceive.go b/modules/mainline/api_taskreceive.go index 6a4b73fce..07618e51f 100644 --- a/modules/mainline/api_taskreceive.go +++ b/modules/mainline/api_taskreceive.go @@ -52,7 +52,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.MainlineTask return } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Taskid); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.Taskid); err != nil { return } diff --git a/modules/moonlv/api_receive.go b/modules/moonlv/api_receive.go index eac8af8a1..cae5a7cbd 100644 --- a/modules/moonlv/api_receive.go +++ b/modules/moonlv/api_receive.go @@ -27,7 +27,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.MoonlvTaskAwar if errdata = this.TaskAwardCheck(session, req); errdata != nil { return } - list, err = this.module.modelMoonlv.getMoonlvList(session.GetUserId()) + list, err = this.module.modelMoonlv.getMoonlvList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/moonlv/model_moonlv.go b/modules/moonlv/model_moonlv.go index 547c72545..39b309775 100644 --- a/modules/moonlv/model_moonlv.go +++ b/modules/moonlv/model_moonlv.go @@ -27,7 +27,8 @@ func (this *modelMoonlv) Init(service core.IService, module core.IModule, comp c return } -func (this *modelMoonlv) getMoonlvList(uid string) (result *pb.DBMoonLv, err error) { +func (this *modelMoonlv) getMoonlvList(session comm.IUserSession) (result *pb.DBMoonLv, err error) { + uid := session.GetUserId() result = &pb.DBMoonLv{} if err = this.Get(uid, result); err != nil { if mongo.ErrNoDocuments == err { @@ -43,7 +44,7 @@ func (this *modelMoonlv) getMoonlvList(uid string) (result *pb.DBMoonLv, err err } } } - if data, err := this.module.ModuleBuried.CheckCondition(uid, szTaskid...); err == nil { + if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil { for _, v := range data { tmp := &pb.MoonTask{ TaskId: v.Conid, diff --git a/modules/moonlv/module.go b/modules/moonlv/module.go index e514b9907..c5a185fc5 100644 --- a/modules/moonlv/module.go +++ b/modules/moonlv/module.go @@ -42,7 +42,7 @@ func (this *Moonlv) OnInstallComp() { func (this *Moonlv) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIProgress) { var groupID int32 this.Debug("护月任务通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "conds", Value: conds}) - dt, err := this.modelMoonlv.getMoonlvList(session.GetUserId()) + dt, err := this.modelMoonlv.getMoonlvList(session) if c, e := this.configure.GetMoonLvConf(dt.Lv); e == nil { groupID = c.TaskGroupId } diff --git a/modules/pushgiftbag/module.go b/modules/pushgiftbag/module.go index 5f274728c..b6ce33e9a 100644 --- a/modules/pushgiftbag/module.go +++ b/modules/pushgiftbag/module.go @@ -141,7 +141,7 @@ func (this *PushGiftbag) BuriedsNotify(session comm.IUserSession, condis []*pb.C for _, v := range comdisScils { if _, ok = condisMap[v]; !ok { //条件不全需要查询全部条件 - if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), comdisScils...); err != nil { + if condis, err = this.ModuleBuried.CheckCondition(session, comdisScils...); err != nil { this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) return } diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index a90389af9..0a2243371 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -77,7 +77,9 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( return } - if err := this.module.modelSociaty.agree(req.Uid, sociaty); err != nil { + tempsession, _ := this.module.GetUserSession(req.Uid) + + if err := this.module.modelSociaty.agree(tempsession, sociaty); err != nil { var customError = new(comm.CustomError) if errors.As(err, &customError) { code := customError.Code diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 5055ab4ef..cc86b5d77 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -115,7 +115,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( } // 申请 - isCheck, err := this.module.modelSociaty.apply(uid, sociaty) + isCheck, err := this.module.modelSociaty.apply(session, sociaty) if err != nil { var customError = new(comm.CustomError) if errors.As(err, &customError) { diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index 129ff1491..49d0b4462 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -212,7 +212,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype188, 1)) // 初始化玩家公会任务 - if err := this.module.modelSociatyTask.initSociatyTask(user.Uid, sociaty.Id); err != nil { + if err := this.module.modelSociatyTask.initSociatyTask(session, sociaty.Id); err != nil { this.module.Error("初始化玩家公会任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}, diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index d1432a0bc..acc1b83c2 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -64,7 +64,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er // 删除任务 if err := this.module.modelSociatyTask.deleTask(sociaty.Id, uid); err == nil { // 初始新的公会任务 - if err = this.module.modelSociatyTask.initSociatyTask(uid, sociaty.Id); err != nil { + if err = this.module.modelSociatyTask.initSociatyTask(session, sociaty.Id); err != nil { this.module.Error("初始化玩家公会任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index d2d2a9fd3..779c358b9 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -43,7 +43,7 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList tasklist = append(tasklist, v.TaskId) // } } - condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasklist...) + condis, err = this.module.ModuleBuried.CheckCondition(session, tasklist...) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go index 1e67b9f47..d71af61f6 100644 --- a/modules/sociaty/model_sociaty.go +++ b/modules/sociaty/model_sociaty.go @@ -259,8 +259,9 @@ func (this *ModelSociaty) getUserSociaty(uid string) (sociaty *pb.DBSociaty) { } // 申请公会 -func (this *ModelSociaty) apply(uid string, sociaty *pb.DBSociaty) (isCheck bool, err error) { +func (this *ModelSociaty) apply(season comm.IUserSession, sociaty *pb.DBSociaty) (isCheck bool, err error) { // 判断公会审批设置 + uid := season.GetUserId() if sociaty.IsApplyCheck { //需要审核 isCheck = true sociaty.ApplyRecord = append(sociaty.ApplyRecord, &pb.ApplyRecord{ @@ -276,7 +277,7 @@ func (this *ModelSociaty) apply(uid string, sociaty *pb.DBSociaty) (isCheck bool return isCheck, err } //初始玩家公会任务 - this.module.modelSociatyTask.initSociatyTask(uid, sociaty.Id) + this.module.modelSociatyTask.initSociatyTask(season, sociaty.Id) } return } @@ -505,7 +506,8 @@ func (this *ModelSociaty) getMemberInfo(sociaty *pb.DBSociaty, uid string) *pb.S } // 同意 -func (this *ModelSociaty) agree(uid string, sociaty *pb.DBSociaty) error { +func (this *ModelSociaty) agree(session comm.IUserSession, sociaty *pb.DBSociaty) error { + uid := session.GetUserId() if this.isMember(uid, sociaty) { return comm.NewCustomError(pb.ErrorCode_SociatyBelongTo) } @@ -533,7 +535,7 @@ func (this *ModelSociaty) agree(uid string, sociaty *pb.DBSociaty) error { } //初始玩家公会任务 - return this.module.modelSociatyTask.initSociatyTask(uid, sociaty.Id) + return this.module.modelSociatyTask.initSociatyTask(session, sociaty.Id) } // 拒绝 diff --git a/modules/sociaty/model_sociatytask.go b/modules/sociaty/model_sociatytask.go index 2e40ed6b1..1cf7fa9d9 100644 --- a/modules/sociaty/model_sociatytask.go +++ b/modules/sociaty/model_sociatytask.go @@ -28,7 +28,8 @@ func (this *ModelSociatyTask) Init(service core.IService, module core.IModule, c } // 初始化公会任务 加入成员时初始化 -func (this *ModelSociatyTask) initSociatyTask(uid, sociatyId string) error { +func (this *ModelSociatyTask) initSociatyTask(session comm.IUserSession, sociatyId string) error { + uid := session.GetUserId() sociatyTask := &pb.DBSociatyTask{ SociatyId: sociatyId, Uid: uid, @@ -60,7 +61,7 @@ func (this *ModelSociatyTask) initSociatyTask(uid, sociatyId string) error { sociatyTask.TaskList = taskList sociatyTask.LastUpdateTime = configure.Now().Unix() // 激活所有任务 - this.moduleSociaty.ModuleBuried.ActiveCondition(uid, condIds...) + this.moduleSociaty.ModuleBuried.ActiveCondition(session, condIds...) return this.moduleSociaty.modelSociatyTask.AddList(sociatyId, uid, sociatyTask) } diff --git a/modules/warorder/api_info.go b/modules/warorder/api_info.go index 354575a11..8e70b5851 100644 --- a/modules/warorder/api_info.go +++ b/modules/warorder/api_info.go @@ -113,7 +113,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e } if len(activation) > 0 { - if errdata = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), activation...); errdata != nil { + if errdata = this.module.ModuleBuried.ActiveCondition(session, activation...); errdata != nil { return } } @@ -132,7 +132,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e } } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(),