diff --git a/comm/const.go b/comm/const.go index 6142158f6..b7974f036 100644 --- a/comm/const.go +++ b/comm/const.go @@ -402,6 +402,8 @@ const ( //推送礼包 TablekTreasuremap = "treasuremap" + + TableEntertainm = "entertainm" ) // RPC服务接口定义处 diff --git a/modules/entertainment/api_getreward.go b/modules/entertainment/api_getreward.go index 372126e01..796cf6b3f 100644 --- a/modules/entertainment/api_getreward.go +++ b/modules/entertainment/api_getreward.go @@ -30,7 +30,13 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.EntertainRewardRe user, err := this.module.ModuleUser.GetUser(session.GetUserId()) if err == nil { - + if user.Consumeexp == 0 { // 0 不让领 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserRepeadReward, + Title: pb.ErrorCode_UserRepeadReward.ToString(), + } + return + } if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil { if _, ok := list.Reward[conf.Key]; !ok { if errdata, atno = this.module.DispenseAtno(session, conf.Rewards, true); errdata != nil { @@ -38,7 +44,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.EntertainRewardRe } list.Reward[conf.Key] = 1 this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{ - "reward": list.Reward[conf.Key], + "reward": list.Reward, }) } else { // 重复领取 errdata = &pb.ErrorData{ diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go index 2fb99ad24..4f3140e15 100644 --- a/modules/entertainment/model.go +++ b/modules/entertainment/model.go @@ -18,7 +18,7 @@ type modelComp struct { } func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TableDragon + this.TableName = comm.TableEntertainm err = this.MCompModel.Init(service, module, comp, options) this.module = module.(*Entertainment) // 通过uid创建索引