diff --git a/modules/uigame/api_minerfinish.go b/modules/uigame/api_minerfinish.go index ccae8d127..58cd42b52 100644 --- a/modules/uigame/api_minerfinish.go +++ b/modules/uigame/api_minerfinish.go @@ -26,32 +26,31 @@ func (this *apiComp) MinerFinish(session comm.IUserSession, req *pb.UiGameMinerF atno []*pb.UserAtno ) list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) - if conf, err := this.module.configure.GetMinerConsumConf(); err != nil { + conf, err := this.module.configure.GetMinerConsumConf() + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return - } else { - list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) - if list.BReward { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ActivityRepatReward, - Title: pb.ErrorCode_ActivityRepatReward.ToString(), - } - return - } - - if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil { - return - } - // 记录数据 - list.BReward = true - update := make(map[string]interface{}, 0) - update["bReward"] = list.BReward - this.module.modelMiner.modifyMinerListByObjId(session.GetUserId(), update) // 修改进度 } + if list.BReward { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityRepatReward, + Title: pb.ErrorCode_ActivityRepatReward.ToString(), + } + return + } + + if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil { + return + } + // 记录数据 + list.BReward = true + update := make(map[string]interface{}, 0) + update["bReward"] = list.BReward + this.module.modelMiner.modifyMinerListByObjId(session.GetUserId(), update) // 修改进度 session.SendMsg(string(this.module.GetType()), "minerFinish", &pb.UiGameMinerFinishResp{ Data: list,