From e54b1a9a00115836e2921a638077346c8c6889fc Mon Sep 17 00:00:00 2001 From: 王家文 Date: Mon, 8 Apr 2024 14:29:15 +0800 Subject: [PATCH] feat:models目录整理 --- controllers/ht-cardholder.go | 10 +++++----- dto/base.go | 20 -------------------- dto/ht-cardholder.go | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- dto/inits.go | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 4 ++-- models/base.go | 20 ++++++++++++++++++++ models/ht-cardholder.go | 121 +++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- models/inits.go | 109 ------------------------------------------------------------------------------------------------------------- service/ht-cardholder/handle.go | 18 +++++++++--------- service/ht-cardholder/logic.go | 16 ++++++++-------- 10 files changed, 274 insertions(+), 274 deletions(-) delete mode 100644 dto/base.go create mode 100644 dto/inits.go create mode 100644 models/base.go delete mode 100644 models/inits.go diff --git a/controllers/ht-cardholder.go b/controllers/ht-cardholder.go index ea22038..d617a08 100644 --- a/controllers/ht-cardholder.go +++ b/controllers/ht-cardholder.go @@ -1,7 +1,7 @@ package controllers import ( - "apigame/dto" + "apigame/models" "apigame/service/ht-cardholder" ) @@ -12,7 +12,7 @@ type HtCardHolderController struct { // Info 卡包信息 func (c *HtCardHolderController) Info() { - req := new(dto.ReqHtCardHolderInfo) + req := new(models.ReqHtCardHolderInfo) if !c.GetPostData(req) { return } @@ -24,7 +24,7 @@ func (c *HtCardHolderController) Info() { // GetNew 获取卡包 func (c *HtCardHolderController) GetNew() { - req := new(dto.ReqHtCardHolderGetNew) + req := new(models.ReqHtCardHolderGetNew) if !c.GetPostData(req) { return } @@ -36,7 +36,7 @@ func (c *HtCardHolderController) GetNew() { // Open 卡包打开 func (c *HtCardHolderController) Open() { - req := new(dto.ReqHtCardHolderOpen) + req := new(models.ReqHtCardHolderOpen) if !c.GetPostData(req) { return } @@ -48,7 +48,7 @@ func (c *HtCardHolderController) Open() { // GetRewardAlbum 领取卡组奖励 func (c *HtCardHolderController) GetRewardAlbum() { - req := new(dto.ReqHtCardHolderGetRewardAlbum) + req := new(models.ReqHtCardHolderGetRewardAlbum) if !c.GetPostData(req) { return } diff --git a/dto/base.go b/dto/base.go deleted file mode 100644 index cc533b3..0000000 --- a/dto/base.go +++ /dev/null @@ -1,20 +0,0 @@ -package dto - -type BaseLoginInfo struct { - UID int64 `form:"uid" json:"uid"` - Token string `form:"token" json:"token"` -} - -type BaseSign struct { - Sign string `form:"sign" json:"sign"` - SignType string `form:"sign_type" json:"sign_type"` - TimeStamp string `form:"time_stamp" json:"time_stamp"` - Ver string `form:"ver" json:"ver"` - GameID string `form:"gameid" json:"gameid"` -} - -type BaseRsp map[string]any - -func NewBaseRsp() BaseRsp { - return make(map[string]any) -} diff --git a/dto/ht-cardholder.go b/dto/ht-cardholder.go index 03347c6..f588d39 100644 --- a/dto/ht-cardholder.go +++ b/dto/ht-cardholder.go @@ -1,61 +1,100 @@ package dto -// 海滩卡包 +import ( + "apigame/lx-util/lxalilog" + "apigame/models" + "apigame/service/constd" + "encoding/json" + "github.com/astaxie/beego/orm" +) -// HtCardHolderInfo 卡包信息 -type HtCardHolderInfo struct { - Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量 - Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 - Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 - Round int `form:"round" json:"round"` // 卡册完成轮次 +func InitHtCardholder() { + + // register model + orm.RegisterModel(new(HtCardHolderData)) + + // create table + orm.RunSyncdb("default", false, true) } -// ReqHtCardHolderInfo 请求 卡包信息 -type ReqHtCardHolderInfo struct { - BaseSign - BaseLoginInfo +// HtCardHolderData 卡牌活动持久数据 +type HtCardHolderData struct { + Uid int64 `orm:"pk"` // 玩家唯一ID + ActivityId int64 // 活动ID + Details *HtCardHolderDataDetails `orm:"-"` // 活动详情 + DetailsText string `orm:"type(text)"` // 活动详情封装 + CreateTime int64 // 创建时间戳 + UpdateTime int64 // 修改时间戳 } -// RspHtCardHolderInfo 返回 卡包信息 -type RspHtCardHolderInfo struct { - HtCardHolderInfo +// HtCardHolderDataDetails 卡牌活动详情 +type HtCardHolderDataDetails struct { + Cardholder map[int]int // 卡包数量 k=卡包ID v=卡包数量 + Cards map[int]int // 每张卡集了多少张 k=卡牌ID v=数量 + Album map[string]int // 卡组奖励领取 k=卡组ID v=数量 + StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度 + CardSequenceScales map[string]int // 卡牌序列刻度 k=ID_用户序列_用户分组 v=刻度 + Round int // 卡册完成轮次 } -// ReqHtCardHolderGetNew 请求 获取卡包 -type ReqHtCardHolderGetNew struct { - BaseSign - BaseLoginInfo - Id int `form:"id" json:"id" valid:"Required"` // 卡包ID - Count int `form:"count" json:"count" valid:"Required"` // 卡包数量 +func NewHtCardHolderData(uid int64) *HtCardHolderData { + return &HtCardHolderData{ + Uid: uid, + Details: NewHtCardHolderDataDetails(), + } } -// RspHtCardHolderGetNew 返回 获取卡包 -type RspHtCardHolderGetNew struct { - HtCardHolderInfo +func NewHtCardHolderDataDetails() *HtCardHolderDataDetails { + return &HtCardHolderDataDetails{ + Cardholder: make(map[int]int), + Cards: make(map[int]int), + Album: make(map[string]int), + StarSequenceScales: make(map[string]int), + CardSequenceScales: make(map[string]int), + Round: 0, + } } -// ReqHtCardHolderOpen 请求 打开卡包 -type ReqHtCardHolderOpen struct { - BaseSign - BaseLoginInfo - Id int `form:"id" json:"id" valid:"Required"` // 卡包ID +func (d *HtCardHolderData) TableName() string { + return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT } -// RspHtCardHolderOpen 返回 打开卡包 -type RspHtCardHolderOpen struct { - HtCardHolderInfo - NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表 +// Encode 打包数据 +func (d *HtCardHolderData) Encode() { + details, err := json.Marshal(d.Details) + if err != nil { + lxalilog.Errors(err, "HtCardHolderData Encode Error", d.Uid, d.ActivityId) + return + } + d.DetailsText = string(details) } -// ReqHtCardHolderGetRewardAlbum 请求 领取卡组奖励 -type ReqHtCardHolderGetRewardAlbum struct { - BaseSign - BaseLoginInfo - Id int `form:"id" json:"id" valid:"Required"` // 卡组ID +// Decode 分包数据 +func (d *HtCardHolderData) Decode() { + err := json.Unmarshal([]byte(d.DetailsText), d.Details) + if err != nil { + lxalilog.Errors(err, "HtCardHolderData Decode Error", d.Uid, d.ActivityId) + return + } } -// RspHtCardHolderGetRewardAlbum 返回 领取卡组奖励 -type RspHtCardHolderGetRewardAlbum struct { - HtCardHolderInfo - Award string `form:"award" json:"award"` // 奖励字符串 +// GetInfo 封装成返回数据 +func (d *HtCardHolderData) GetInfo() models.HtCardHolderInfo { + info := models.HtCardHolderInfo{ + Cardholder: make(map[int]int), + Cards: make(map[int]int), + Album: make(map[string]int), + Round: 0, + } + for i, i2 := range d.Details.Cardholder { + info.Cardholder[i] = i2 + } + for i, i2 := range d.Details.Cards { + info.Cards[i] = i2 + } + for i, i2 := range d.Details.Album { + info.Album[i] = i2 + } + info.Round = d.Details.Round + return info } diff --git a/dto/inits.go b/dto/inits.go new file mode 100644 index 0000000..e55315b --- /dev/null +++ b/dto/inits.go @@ -0,0 +1,109 @@ +package dto + +import ( + "apigame/lx-util/lxalilog" + "apigame/lx-util/lxbeego" + "apigame/lx-util/lxmysql" + "apigame/service/constd" + "fmt" + "github.com/astaxie/beego" + lalilog "github.com/lixu-any/go-tools/ali/log" +) + +func Inits() (err error) { + + appname := beego.AppConfig.String("appname") + + // 初始化日志文件 + logconfig, _ := beego.AppConfig.GetSection("log") + logconfig["filename"] = logconfig["path"] + "api.log" + + if err = lxbeego.Inits(logconfig); err != nil { + fmt.Println("lxbeelog.Inits Error::" + err.Error()) + } + + fmt.Println(appname + " beelog init success") + + ////初始化Redis + //redisconfig, _ := beego.AppConfig.GetSection("redis") + //var mredisconfig lxredis.MapRedisConfig + //err = mapstructure.Decode(redisconfig, &mredisconfig) + //if err != nil { + // fmt.Println(" mapstructure.Decode Error::" + err.Error()) + //} else { + // err = lxredis.InitRedis(mredisconfig) + // if err != nil { + // fmt.Println(" lxredis.InitRedis Error::" + err.Error()) + // return err + // } + //} + // + //fmt.Println(appname + " redis init success") + + //初始化MYSQL + var conns []lxmysql.MapMysqlConn + + //默认数据库 + conns = append(conns, lxmysql.MapMysqlConn{ + Name: constd.MYSQL_DEFAULT, + SqlCon: beego.AppConfig.String("mysql::mergecommon"), + }) + + conns = append(conns, lxmysql.MapMysqlConn{ + Name: constd.MYSQL_MERGECONFIG, + SqlCon: beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG), + }) + + err = lxmysql.InitMysqls(conns, beego.AppConfig.String("redis::cachedb")) + if err != nil { + fmt.Println(" InitMysqls Error::" + err.Error()) + } + + for _, conn := range conns { + fmt.Println(appname + " dbs::" + conn.Name + " init success") + } + + //initAlilog(appname) + + //// 初始化数数打点 + //_ = thinkingdata.InitThinkData() + // + //_ = config.InitLxLimit() + + // 海滩卡包 + InitHtCardholder() + + return +} + +func initAlilog(appname string) { + + //初始化阿里云日志 + logm, _ := beego.AppConfig.GetSection("alilog") + lxalilog.InitAliLog(lxalilog.MapAlilogConfig{ + Endpoint: logm["endpoint"], + AccessKeyId: logm["accesskeyid"], + AccessKeySecret: logm["accesskeysecret"], + Project: logm["project"], + AppNaame: appname, + On: logm["on"], + Debug: logm["debug"], + TableError: "api_code_merge", + TableDebug: logm["tabledebug"], + Env: beego.AppConfig.String("env"), + }) + + lalilog.InitAliLog(lalilog.MapAlilogConfig{ + Endpoint: logm["endpoint"], + AccessKeyId: logm["accesskeyid"], + AccessKeySecret: logm["accesskeysecret"], + Project: logm["project"], + On: logm["on"], + Debug: logm["debug"], + TableError: logm["tableerror"], + TableDebug: logm["tabledebug"], + Env: beego.AppConfig.String("env"), + }) + + fmt.Println(appname + " alilog init success") +} diff --git a/main.go b/main.go index 8c111f0..354401e 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "apigame/models" + "apigame/dto" _ "apigame/routers" "apigame/service/ht-cardholder" "github.com/astaxie/beego" @@ -28,7 +28,7 @@ func main() { beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" } - _ = models.Inits() + _ = dto.Inits() // 初始化配置 ht_cardholder.Init() diff --git a/models/base.go b/models/base.go new file mode 100644 index 0000000..62873fd --- /dev/null +++ b/models/base.go @@ -0,0 +1,20 @@ +package models + +type BaseLoginInfo struct { + UID int64 `form:"uid" json:"uid"` + Token string `form:"token" json:"token"` +} + +type BaseSign struct { + Sign string `form:"sign" json:"sign"` + SignType string `form:"sign_type" json:"sign_type"` + TimeStamp string `form:"time_stamp" json:"time_stamp"` + Ver string `form:"ver" json:"ver"` + GameID string `form:"gameid" json:"gameid"` +} + +type BaseRsp map[string]any + +func NewBaseRsp() BaseRsp { + return make(map[string]any) +} diff --git a/models/ht-cardholder.go b/models/ht-cardholder.go index ae7ae5e..c0cf12c 100644 --- a/models/ht-cardholder.go +++ b/models/ht-cardholder.go @@ -1,100 +1,61 @@ package models -import ( - "apigame/dto" - "apigame/lx-util/lxalilog" - "apigame/service/constd" - "encoding/json" - "github.com/astaxie/beego/orm" -) +// 海滩卡包 -func InitHtCardholder() { - - // register model - orm.RegisterModel(new(HtCardHolderData)) - - // create table - orm.RunSyncdb("default", false, true) +// HtCardHolderInfo 卡包信息 +type HtCardHolderInfo struct { + Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量 + Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 + Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 + Round int `form:"round" json:"round"` // 卡册完成轮次 } -// HtCardHolderData 卡牌活动持久数据 -type HtCardHolderData struct { - Uid int64 `orm:"pk"` // 玩家唯一ID - ActivityId int64 // 活动ID - Details *HtCardHolderDataDetails `orm:"-"` // 活动详情 - DetailsText string `orm:"type(text)"` // 活动详情封装 - CreateTime int64 // 创建时间戳 - UpdateTime int64 // 修改时间戳 +// ReqHtCardHolderInfo 请求 卡包信息 +type ReqHtCardHolderInfo struct { + BaseSign + BaseLoginInfo } -// HtCardHolderDataDetails 卡牌活动详情 -type HtCardHolderDataDetails struct { - Cardholder map[int]int // 卡包数量 k=卡包ID v=卡包数量 - Cards map[int]int // 每张卡集了多少张 k=卡牌ID v=数量 - Album map[string]int // 卡组奖励领取 k=卡组ID v=数量 - StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度 - CardSequenceScales map[string]int // 卡牌序列刻度 k=ID_用户序列_用户分组 v=刻度 - Round int // 卡册完成轮次 +// RspHtCardHolderInfo 返回 卡包信息 +type RspHtCardHolderInfo struct { + HtCardHolderInfo } -func NewHtCardHolderData(uid int64) *HtCardHolderData { - return &HtCardHolderData{ - Uid: uid, - Details: NewHtCardHolderDataDetails(), - } +// ReqHtCardHolderGetNew 请求 获取卡包 +type ReqHtCardHolderGetNew struct { + BaseSign + BaseLoginInfo + Id int `form:"id" json:"id" valid:"Required"` // 卡包ID + Count int `form:"count" json:"count" valid:"Required"` // 卡包数量 } -func NewHtCardHolderDataDetails() *HtCardHolderDataDetails { - return &HtCardHolderDataDetails{ - Cardholder: make(map[int]int), - Cards: make(map[int]int), - Album: make(map[string]int), - StarSequenceScales: make(map[string]int), - CardSequenceScales: make(map[string]int), - Round: 0, - } +// RspHtCardHolderGetNew 返回 获取卡包 +type RspHtCardHolderGetNew struct { + HtCardHolderInfo } -func (d *HtCardHolderData) TableName() string { - return constd.MYSQL_TABLE_S_CARD_DATA + constd.GAME_ID_HT +// ReqHtCardHolderOpen 请求 打开卡包 +type ReqHtCardHolderOpen struct { + BaseSign + BaseLoginInfo + Id int `form:"id" json:"id" valid:"Required"` // 卡包ID } -// Encode 打包数据 -func (d *HtCardHolderData) Encode() { - details, err := json.Marshal(d.Details) - if err != nil { - lxalilog.Errors(err, "HtCardHolderData Encode Error", d.Uid, d.ActivityId) - return - } - d.DetailsText = string(details) +// RspHtCardHolderOpen 返回 打开卡包 +type RspHtCardHolderOpen struct { + HtCardHolderInfo + NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表 } -// Decode 分包数据 -func (d *HtCardHolderData) Decode() { - err := json.Unmarshal([]byte(d.DetailsText), d.Details) - if err != nil { - lxalilog.Errors(err, "HtCardHolderData Decode Error", d.Uid, d.ActivityId) - return - } +// ReqHtCardHolderGetRewardAlbum 请求 领取卡组奖励 +type ReqHtCardHolderGetRewardAlbum struct { + BaseSign + BaseLoginInfo + Id int `form:"id" json:"id" valid:"Required"` // 卡组ID } -// GetInfo 封装成返回数据 -func (d *HtCardHolderData) GetInfo() dto.HtCardHolderInfo { - info := dto.HtCardHolderInfo{ - Cardholder: make(map[int]int), - Cards: make(map[int]int), - Album: make(map[string]int), - Round: 0, - } - for i, i2 := range d.Details.Cardholder { - info.Cardholder[i] = i2 - } - for i, i2 := range d.Details.Cards { - info.Cards[i] = i2 - } - for i, i2 := range d.Details.Album { - info.Album[i] = i2 - } - info.Round = d.Details.Round - return info +// RspHtCardHolderGetRewardAlbum 返回 领取卡组奖励 +type RspHtCardHolderGetRewardAlbum struct { + HtCardHolderInfo + Award string `form:"award" json:"award"` // 奖励字符串 } diff --git a/models/inits.go b/models/inits.go deleted file mode 100644 index 1ec2116..0000000 --- a/models/inits.go +++ /dev/null @@ -1,109 +0,0 @@ -package models - -import ( - "apigame/lx-util/lxalilog" - "apigame/lx-util/lxbeego" - "apigame/lx-util/lxmysql" - "apigame/service/constd" - "fmt" - "github.com/astaxie/beego" - lalilog "github.com/lixu-any/go-tools/ali/log" -) - -func Inits() (err error) { - - appname := beego.AppConfig.String("appname") - - // 初始化日志文件 - logconfig, _ := beego.AppConfig.GetSection("log") - logconfig["filename"] = logconfig["path"] + "api.log" - - if err = lxbeego.Inits(logconfig); err != nil { - fmt.Println("lxbeelog.Inits Error::" + err.Error()) - } - - fmt.Println(appname + " beelog init success") - - ////初始化Redis - //redisconfig, _ := beego.AppConfig.GetSection("redis") - //var mredisconfig lxredis.MapRedisConfig - //err = mapstructure.Decode(redisconfig, &mredisconfig) - //if err != nil { - // fmt.Println(" mapstructure.Decode Error::" + err.Error()) - //} else { - // err = lxredis.InitRedis(mredisconfig) - // if err != nil { - // fmt.Println(" lxredis.InitRedis Error::" + err.Error()) - // return err - // } - //} - // - //fmt.Println(appname + " redis init success") - - //初始化MYSQL - var conns []lxmysql.MapMysqlConn - - //默认数据库 - conns = append(conns, lxmysql.MapMysqlConn{ - Name: constd.MYSQL_DEFAULT, - SqlCon: beego.AppConfig.String("mysql::mergecommon"), - }) - - conns = append(conns, lxmysql.MapMysqlConn{ - Name: constd.MYSQL_MERGECONFIG, - SqlCon: beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG), - }) - - err = lxmysql.InitMysqls(conns, beego.AppConfig.String("redis::cachedb")) - if err != nil { - fmt.Println(" InitMysqls Error::" + err.Error()) - } - - for _, conn := range conns { - fmt.Println(appname + " dbs::" + conn.Name + " init success") - } - - //initAlilog(appname) - - //// 初始化数数打点 - //_ = thinkingdata.InitThinkData() - // - //_ = config.InitLxLimit() - - // 海滩卡包 - InitHtCardholder() - - return -} - -func initAlilog(appname string) { - - //初始化阿里云日志 - logm, _ := beego.AppConfig.GetSection("alilog") - lxalilog.InitAliLog(lxalilog.MapAlilogConfig{ - Endpoint: logm["endpoint"], - AccessKeyId: logm["accesskeyid"], - AccessKeySecret: logm["accesskeysecret"], - Project: logm["project"], - AppNaame: appname, - On: logm["on"], - Debug: logm["debug"], - TableError: "api_code_merge", - TableDebug: logm["tabledebug"], - Env: beego.AppConfig.String("env"), - }) - - lalilog.InitAliLog(lalilog.MapAlilogConfig{ - Endpoint: logm["endpoint"], - AccessKeyId: logm["accesskeyid"], - AccessKeySecret: logm["accesskeysecret"], - Project: logm["project"], - On: logm["on"], - Debug: logm["debug"], - TableError: logm["tableerror"], - TableDebug: logm["tabledebug"], - Env: beego.AppConfig.String("env"), - }) - - fmt.Println(appname + " alilog init success") -} diff --git a/service/ht-cardholder/handle.go b/service/ht-cardholder/handle.go index bf8a1b7..5a29b19 100644 --- a/service/ht-cardholder/handle.go +++ b/service/ht-cardholder/handle.go @@ -1,15 +1,15 @@ package ht_cardholder import ( - "apigame/dto" + "apigame/models" "apigame/service/constd" "apigame/util/uttype" "strconv" ) // HandleInfo 卡包信息 -func HandleInfo(req *dto.ReqHtCardHolderInfo) (code string, rsp dto.RspHtCardHolderInfo) { - rsp = dto.RspHtCardHolderInfo{} +func HandleInfo(req *models.ReqHtCardHolderInfo) (code string, rsp models.RspHtCardHolderInfo) { + rsp = models.RspHtCardHolderInfo{} code = constd.RECODE_OK // 尝试更新配置 @@ -24,8 +24,8 @@ func HandleInfo(req *dto.ReqHtCardHolderInfo) (code string, rsp dto.RspHtCardHol } // HandleGetNew 获取卡包 -func HandleGetNew(req *dto.ReqHtCardHolderGetNew) (code string, rsp dto.RspHtCardHolderGetNew) { - rsp = dto.RspHtCardHolderGetNew{} +func HandleGetNew(req *models.ReqHtCardHolderGetNew) (code string, rsp models.RspHtCardHolderGetNew) { + rsp = models.RspHtCardHolderGetNew{} code = constd.RECODE_OK // 尝试更新配置 @@ -61,8 +61,8 @@ func HandleGetNew(req *dto.ReqHtCardHolderGetNew) (code string, rsp dto.RspHtCar } // HandleOpen 打开卡包 -func HandleOpen(req *dto.ReqHtCardHolderOpen) (code string, rsp dto.RspHtCardHolderOpen) { - rsp = dto.RspHtCardHolderOpen{} +func HandleOpen(req *models.ReqHtCardHolderOpen) (code string, rsp models.RspHtCardHolderOpen) { + rsp = models.RspHtCardHolderOpen{} code = constd.RECODE_OK // 尝试更新配置 @@ -160,8 +160,8 @@ func HandleOpen(req *dto.ReqHtCardHolderOpen) (code string, rsp dto.RspHtCardHol } // HandleGetRewardAlbum 领取卡组奖励 -func HandleGetRewardAlbum(req *dto.ReqHtCardHolderGetRewardAlbum) (code string, rsp dto.RspHtCardHolderGetRewardAlbum) { - rsp = dto.RspHtCardHolderGetRewardAlbum{} +func HandleGetRewardAlbum(req *models.ReqHtCardHolderGetRewardAlbum) (code string, rsp models.RspHtCardHolderGetRewardAlbum) { + rsp = models.RspHtCardHolderGetRewardAlbum{} code = constd.RECODE_OK // 尝试更新配置 diff --git a/service/ht-cardholder/logic.go b/service/ht-cardholder/logic.go index acc3987..453ecb5 100644 --- a/service/ht-cardholder/logic.go +++ b/service/ht-cardholder/logic.go @@ -1,16 +1,16 @@ package ht_cardholder import ( + "apigame/dto" "apigame/lx-util/lxalilog" "apigame/lx-util/lxtime" - "apigame/models" "apigame/service/constd" "apigame/util/uttype" "github.com/astaxie/beego/orm" ) // SaveData 存储数据 -func SaveData(d *models.HtCardHolderData) { +func SaveData(d *dto.HtCardHolderData) { d.UpdateTime = lxtime.NowUninx() d.Encode() o := orm.NewOrm() @@ -20,8 +20,8 @@ func SaveData(d *models.HtCardHolderData) { } } -func _LoadData(uid int64) (d *models.HtCardHolderData) { - d = models.NewHtCardHolderData(uid) +func _LoadData(uid int64) (d *dto.HtCardHolderData) { + d = dto.NewHtCardHolderData(uid) o := orm.NewOrm() o.Using(constd.MYSQL_DEFAULT) qs := o.QueryTable(d) @@ -34,7 +34,7 @@ func _LoadData(uid int64) (d *models.HtCardHolderData) { if err != nil { lxalilog.Errors(err, "ht_cardholder LoadData Error", uid) } else { - d.Details = models.NewHtCardHolderDataDetails() + d.Details = dto.NewHtCardHolderDataDetails() d.Decode() } } @@ -42,13 +42,13 @@ func _LoadData(uid int64) (d *models.HtCardHolderData) { } // LoadData 获取数据 外部接口 -func LoadData(uid int64) (d *models.HtCardHolderData) { +func LoadData(uid int64) (d *dto.HtCardHolderData) { d = _LoadData(uid) // 如果当前有上线活动(活动ID不为0)，且活动ID和玩家数据不同，说明活动已切换 需更新 if Config.Id != 0 && Config.Id != d.ActivityId { d.ActivityId = Config.Id - d.Details = models.NewHtCardHolderDataDetails() + d.Details = dto.NewHtCardHolderDataDetails() SaveData(d) } return @@ -105,7 +105,7 @@ func GetListFromArray(array []string, scale, count int) []string { } // GetNewCard 按顺序查找数目最少的一张卡抽取 -func GetNewCard(gameData *models.HtCardHolderData) int { +func GetNewCard(gameData *dto.HtCardHolderData) int { if len(Config.CardConfig) < 1 { return 0 } -- libgit2 0.21.0