From 2e9027c655ddcc14d8f87386a0be21e6e5845e78 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 28 Nov 2022 15:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=BC=80=E5=90=AF=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sys/module.go | 3 +-- modules/user/api_sign.go | 4 ++- modules/user/model_sign.go | 55 -------------------------------------- 3 files changed, 4 insertions(+), 58 deletions(-) diff --git a/modules/sys/module.go b/modules/sys/module.go index 28bf966c5..a2f12427a 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -33,6 +33,5 @@ func (this *ModuleSys) GetType() core.M_Modules { } func (this *ModuleSys) IsAccess(funcName string, userId string) (code pb.ErrorCode) { - // return this.modelSys.IsAccess(funcName, userId) - return pb.ErrorCode_Success + return this.modelSys.IsAccess(funcName, userId) } diff --git a/modules/user/api_sign.go b/modules/user/api_sign.go index 196823197..3a99cd44a 100644 --- a/modules/user/api_sign.go +++ b/modules/user/api_sign.go @@ -22,7 +22,9 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code update map[string]interface{} bReward bool ) - + if code = this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success { + return + } update = make(map[string]interface{}, 0) if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { start, _ := utils.GetMonthStartEnd() diff --git a/modules/user/model_sign.go b/modules/user/model_sign.go index 80c3a7ff9..15d462c76 100644 --- a/modules/user/model_sign.go +++ b/modules/user/model_sign.go @@ -69,58 +69,3 @@ func (this *ModelSign) updateSignData(uid string, sign *pb.DBSign) (err error) { } return } - -// 检测是否达到重置日期 -func (this *ModelSign) checkResetSignData(session comm.IUserSession) (code pb.ErrorCode) { - var ( - update map[string]interface{} - bReward bool - ) - - update = make(map[string]interface{}, 0) - if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { - start, _ := utils.GetMonthStartEnd() - if sign.RTime < start { // 重置 - sign.RTime = configure.Now().Unix() - sign.SignTime = sign.RTime - sign.SignCount = 1 - if newGroup := this.module.configure.GetSignResetConf(sign.Cid + 1); newGroup != -1 { // 获取当前的组id - sign.Cid += 1 - sign.Group = newGroup - update["cid"] = sign.Cid - update["group"] = sign.Group - } - update["rTime"] = sign.RTime - update["signTime"] = sign.SignTime - update["signCount"] = sign.SignCount - this.Change(session.GetUserId(), update) - bReward = true - } else { - if !utils.IsToday(sign.SignTime) { - sign.SignCount += 1 - update["signCount"] = sign.SignCount - sign.SignTime = configure.Now().Unix() - update["signTime"] = sign.SignTime - sign.RTime = sign.SignTime - update["rTime"] = sign.RTime - this.Change(session.GetUserId(), update) - bReward = true - } - } - _data := this.module.configure.GetSignConf(sign.Cid, sign.Group) - if _data != nil { // 发奖 - if bReward { - this.module.DispenseRes(session, _data.Loopgift, true) - } - } else { - if bReward { - this.module.DispenseRes(session, this.module.globalConf.UnifiedReward, true) // 发放通用奖励 - } - } - session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{ - Data: sign, - Reward: bReward, - }) - } - return -}