diff --git a/modules/buried/module.go b/modules/buried/module.go index 8371d5fd5..75f31da38 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -136,12 +136,16 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) { //激活数据采集点 func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) { var ( + model *buriedModel bdatas *pb.DBBuried conf *cfg.GameBuriedCondiData bdata *pb.DBBuriedItem ok bool ) - if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil { + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { return } condis = make([]*pb.ConIProgress, 0) @@ -194,6 +198,7 @@ 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) { var ( + model *buriedModel bdatas *pb.DBBuried bitem *pb.DBBuriedConItem conf *cfg.GameBuriedCondiData @@ -201,7 +206,11 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, chanage bool bdata *pb.DBBuriedItem ) - if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil { + + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { return } @@ -323,7 +332,7 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, } if chanage { - if err = this.modelBuried.updateUserBurieds(uid, bdatas); err != nil { + if err = model.updateUserBurieds(uid, bdatas); err != nil { this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()}) return } diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 828f032a7..7eb4bd30b 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -491,7 +491,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), + Message: fmt.Sprintf("no fond pos:%d intlv:%d", pos, lv), } return } else { diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 15d7b41b2..83c335577 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -112,9 +112,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata } if conf.Buyminnum-record.Buy[req.GoodsId] < req.BuyNum { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ShopGoodsIsSoldOut, - Title: pb.ErrorCode_ShopGoodsIsSoldOut.ToString(), - Message: err.Error(), + Code: pb.ErrorCode_ShopGoodsIsSoldOut, + Title: pb.ErrorCode_ShopGoodsIsSoldOut.ToString(), } return }