From fc788396dce7ca185179dd75bfe951ce5a2f321e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 16 Aug 2022 18:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 1 + modules/gourmet/api.go | 2 +- modules/gourmet/api_createorder.go | 13 ++++++---- modules/gourmet/api_getReward.go | 8 +++--- modules/gourmet/api_getlist.go | 11 +++++++++ modules/gourmet/comp_configure.go | 10 ++++++++ modules/gourmet/model_gourmet.go | 39 ++++++++++++++++++++++++++++++ modules/gourmet/model_pagoda.go | 20 --------------- modules/gourmet/module.go | 10 ++++---- services/worker/main.go | 2 ++ 10 files changed, 81 insertions(+), 35 deletions(-) create mode 100644 modules/gourmet/model_gourmet.go delete mode 100644 modules/gourmet/model_pagoda.go diff --git a/comm/const.go b/comm/const.go index bdee2e3bb..626ec5f70 100644 --- a/comm/const.go +++ b/comm/const.go @@ -47,6 +47,7 @@ const ( ModuleGM core.M_Modules = "gm" //gm模块 ModulePagoda core.M_Modules = "pagoda" //魔塔模块 ModuleMartialhall core.M_Modules = "martialhall" //武馆模块 + ModuleGourmet core.M_Modules = "gourmet" //美食馆 ) //数据表名定义处 diff --git a/modules/gourmet/api.go b/modules/gourmet/api.go index e85ebd6e5..e585916b0 100644 --- a/modules/gourmet/api.go +++ b/modules/gourmet/api.go @@ -6,7 +6,7 @@ import ( ) const ( - PagodaGetListResp = "getlist" + GourmetGetListResp = "getlist" PagodaChallengeResp = "challenge" PagodaGetRewardResp = "getreward" ) diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go index a23326c0a..b587a1eab 100644 --- a/modules/gourmet/api_createorder.go +++ b/modules/gourmet/api_createorder.go @@ -8,15 +8,18 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode) { - +func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode) { + if len(req.Order) == 0 { + code = pb.ErrorCode_ReqParameterError + return + } return } -///美食城领取奖励 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode, data proto.Message) { +///美食城创建订单 +func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) { - code = this.GetRewardCheck(session, req) + code = this.CreateOrderCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } diff --git a/modules/gourmet/api_getReward.go b/modules/gourmet/api_getReward.go index 1772b1857..a23326c0a 100644 --- a/modules/gourmet/api_getReward.go +++ b/modules/gourmet/api_getReward.go @@ -8,15 +8,15 @@ import ( ) //参数校验 -func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode) { +func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode) { return } -///美食城创建订单 -func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) { +///美食城领取奖励 +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode, data proto.Message) { - code = this.CreateOrderCheck(session, req) + code = this.GetRewardCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } diff --git a/modules/gourmet/api_getlist.go b/modules/gourmet/api_getlist.go index 11270ec92..e3e10739d 100644 --- a/modules/gourmet/api_getlist.go +++ b/modules/gourmet/api_getlist.go @@ -16,5 +16,16 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.GourmetGetL ///获取美食城基本信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.GourmetGetListReq) (code pb.ErrorCode, data proto.Message) { + code = this.GetListCheck(session, req) + if code != pb.ErrorCode_Success { + return // 参数校验失败直接返回 + } + _gourmet, err := this.module.modelGourmet.getGourmetList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + session.SendMsg(string(this.module.GetType()), GourmetGetListResp, &pb.GourmetGetListResp{Data: _gourmet}) return } diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go index fcb2ff04d..7e21725dc 100644 --- a/modules/gourmet/comp_configure.go +++ b/modules/gourmet/comp_configure.go @@ -56,6 +56,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp log.Errorf("get game_pagoda conf err:%v", err) return }) + + // _data := this.GetGourmetConfigData(1002, 4) // 测试配置文件读取 + // _dataskill := this.GetGourmetSkillConfigData(1001, 4) + // fmt.Printf("%v,%v", _data, _dataskill) return } @@ -65,6 +69,12 @@ func (this *configureComp) GetGourmetConfigData(gourmetType int32, level int32) return this._gourmetMap[int64(gourmetType<<16)+int64(level)] } +// 获取美食馆配置数据 +func (this *configureComp) GetGourmetSkillConfigData(gourmetType int32, level int32) (data *cfg.GameGourmetSkillData) { + + return this._gourmetSkillMap[int64(gourmetType<<16)+int64(level)] +} + //加载多个配置文件 func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) { for k, v := range confs { diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go new file mode 100644 index 000000000..ab07ac7c6 --- /dev/null +++ b/modules/gourmet/model_gourmet.go @@ -0,0 +1,39 @@ +package gourmet + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/redis" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +type modelGourmet struct { + modules.MCompModel + module *Gourmet +} + +func (this *modelGourmet) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = string(comm.TableGourmet) + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*Gourmet) + + return +} + +func (this *modelGourmet) getGourmetList(uid string) (result *pb.DBGourmet, err error) { + result = &pb.DBGourmet{} + if err = this.Get(uid, result); err != nil { + if redis.RedisNil != err { // 没有数据直接创建新的数据 + result.Uid = uid + if err = this.Add(uid, result); err != nil { + this.module.Errorf("err:%v", err) + err = nil + return + } + } + return + } + err = nil + return result, err +} diff --git a/modules/gourmet/model_pagoda.go b/modules/gourmet/model_pagoda.go deleted file mode 100644 index 2c87d0d22..000000000 --- a/modules/gourmet/model_pagoda.go +++ /dev/null @@ -1,20 +0,0 @@ -package gourmet - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/modules" -) - -type ModelPagoda struct { - modules.MCompModel - module *Gourmet -} - -func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = string(comm.TableGourmet) - err = this.MCompModel.Init(service, module, comp, options) - this.module = module.(*Gourmet) - - return -} diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go index 621242f07..d18f2d650 100644 --- a/modules/gourmet/module.go +++ b/modules/gourmet/module.go @@ -9,9 +9,9 @@ import ( type Gourmet struct { modules.ModuleBase - modelPagoda *ModelPagoda - api *apiComp - configure *configureComp + modelGourmet *modelGourmet + api *apiComp + configure *configureComp } func NewModule() core.IModule { @@ -19,7 +19,7 @@ func NewModule() core.IModule { } func (this *Gourmet) GetType() core.M_Modules { - return comm.ModulePagoda + return comm.ModuleGourmet } func (this *Gourmet) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { @@ -31,7 +31,7 @@ func (this *Gourmet) Init(service core.IService, module core.IModule, options co func (this *Gourmet) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - this.modelPagoda = this.RegisterComp(new(ModelPagoda)).(*ModelPagoda) + this.modelGourmet = this.RegisterComp(new(modelGourmet)).(*modelGourmet) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/services/worker/main.go b/services/worker/main.go index 515f86d0f..132283c2b 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/modules/forum" "go_dreamfactory/modules/friend" "go_dreamfactory/modules/gm" + "go_dreamfactory/modules/gourmet" "go_dreamfactory/modules/hero" "go_dreamfactory/modules/items" "go_dreamfactory/modules/mail" @@ -59,6 +60,7 @@ func main() { gm.NewModule(), forum.NewModule(), pagoda.NewModule(), + gourmet.NewModule(), ) }