diff --git a/server/wheelserver/api/v1/buff/buff.go b/server/wheelserver/api/v1/buff/buff.go index 8099682f..dfdb48d2 100644 --- a/server/wheelserver/api/v1/buff/buff.go +++ b/server/wheelserver/api/v1/buff/buff.go @@ -5,9 +5,8 @@ import ( "f5" "main/constant" "main/common" - "main/model" + "main/service" "main/vo" - "main/mt" "github.com/gin-gonic/gin" ) @@ -19,34 +18,19 @@ func (this *BuffApi) List(c *gin.Context) { if s == nil { return } - user := new(model.User) - rspObj := struct { - vo.BaseVo - UserInfo vo.User `json:"user_info"` - }{} - nowTime := f5.GetApp().GetRealSeconds() - if err, found := user.Find(s.GetAccountId(), nowTime); err != nil { + err, buffs := service.Buff.List(s.GetAccountId()) + if err != nil { f5.RspErr(c, 500, "server internal error") return - } else if !found { - user.AccountId = s.GetAccountId() - user.Avatar = "" - user.NickName = s.GetNickName() - user.Score = 0 - user.Dice = mt.Table.Global.GetDailyDiceNum() - user.LastPresentDiceTime = q5.ToInt32(nowTime) - user.CreateTime = q5.ToInt32(nowTime) - user.ModifyTime = q5.ToInt32(nowTime) - if user.Create() != nil { - f5.RspErr(c, 500, "server internal error") - return - } - f5.GetMsgQueue().FireEvent(constant.MSG_CREATE_USER, q5.Args{user}) } - if user.NickName != s.GetNickName() { - user.UpdateName() + rspObj := struct { + vo.BaseVo + Data []*vo.Buff `json:"data"` + }{} + for _, m := range buffs { + v := new(vo.Buff) + v.FromModel(m) + q5.AppendSlice(&rspObj.Data, v) } - f5.GetMsgQueue().FireEvent(constant.MSG_LOGIN, q5.Args{user}) - rspObj.UserInfo.FromModel(user) c.JSON(200, rspObj) } diff --git a/server/wheelserver/vo/buff.go b/server/wheelserver/vo/buff.go new file mode 100644 index 00000000..7daecb03 --- /dev/null +++ b/server/wheelserver/vo/buff.go @@ -0,0 +1,18 @@ +package vo + +import ( + "q5" + "main/model" +) + +type Buff struct { + BuffUniId string `json:"buff_uniid"` + BuffId int32 `json:"buff_id"` + DurationTime int32 `json:"duration_time"` +} + +func (this *Buff) FromModel(m *model.Buff) { + this.BuffUniId = q5.ToString(m.Idx) + this.BuffId = m.BuffId + //this.ItemNum = m. +}