server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
yangduo 2024-12-12 10:27:40 +08:00
parent 727765e853
commit 9baddab371
10 changed files with 113 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/wheelserver/api/v1/activity/activity.go
View File

@ -103,13 +103,14 @@ func (this *ActivityApi) RollDice(c *gin.Context) {
} }
user.CurrGrid += rspObj.Point user.CurrGrid += rspObj.Point
} }
user.UpdateFields([]string{"curr_grid"}) // user.UpdateFields([]string{"curr_grid"})
user.AddFields("curr_grid")
items := gridMeta.GetRewardItems() items := gridMeta.GetRewardItems()
if items == nil { if items == nil {
f5.RspErr(c, 500, "server internal error7") f5.RspErr(c, 500, "server internal error7")
return return
} }
fullgrid := false fullgrid := false
if len(*items) > 0 { if len(*items) > 0 {
gridawarded := false gridawarded := false
@ -156,6 +157,7 @@ func (this *ActivityApi) RollDice(c *gin.Context) {
} }
rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user) rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user)
user.UpdateUserFields()
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }
@ -197,8 +199,9 @@ func (this *ActivityApi) Claim(c *gin.Context) {
} }
user.CurrGrid = 1 user.CurrGrid = 1
user.AwardGrids = "" user.ClearAwardGrid()
user.UpdateFields([]string{"curr_grid", "award_grids"}) // user.UpdateFields([]string{"curr_grid", "award_grids"})
user.AddFields("curr_grid")
for _, item := range *items { for _, item := range *items {
rspObj.GetOrCreateAward().AddItem(item.ItemId, item.ItemNum) rspObj.GetOrCreateAward().AddItem(item.ItemId, item.ItemNum)
@ -214,5 +217,6 @@ func (this *ActivityApi) Claim(c *gin.Context) {
} }
rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user) rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user)
user.UpdateUserFields()
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }

3
server/wheelserver/api/v1/inapp_shop/inapp_shop.go
View File

@ -198,5 +198,6 @@ func (this *InAppShopApi) Callback(c *gin.Context) {
service.Award.AddItem(orderModel.AccountId, itemcfg.GetId(), ordergoods.GetAmount(), nil) service.Award.AddItem(orderModel.AccountId, itemcfg.GetId(), ordergoods.GetAmount(), nil)
} }
service.Task.UpdateTaskProgress(orderModel.AccountId, itemcfg.GetItemType(), ordergoods.GetAmount(), nil) service.Task.UpdateTaskProgress(orderModel.AccountId, itemcfg.GetItemType(), ordergoods.GetAmount(), nil)
user.UpdateUserFields()
} }

2
server/wheelserver/api/v1/mission/mission.go
View File

@ -163,5 +163,7 @@ func (this *MissionApi) ClaimTaskAward(c *gin.Context) {
q5.AppendSlice(&rspObj.Data, missionVo) q5.AppendSlice(&rspObj.Data, missionVo)
} }
user.UpdateUserFields()
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }

1
server/wheelserver/api/v1/shop/shop.go
View File

@ -101,5 +101,6 @@ func (this *ShopApi) Buy(c *gin.Context) {
q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task")
} }
user.UpdateUserFields()
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }

3
server/wheelserver/api/v1/user/user.go
View File

@ -63,13 +63,14 @@ func (this *UserApi) Login(c *gin.Context) {
} }
if user.NickName != s.GetNickName() { if user.NickName != s.GetNickName() {
user.UpdateName() user.UpdateName(s.GetNickName())
} }
f5.GetMsgQueue().FireEvent(constant.MSG_LOGIN, q5.Args{user}) f5.GetMsgQueue().FireEvent(constant.MSG_LOGIN, q5.Args{user})
rspObj.UserInfo.FromModel(user) rspObj.UserInfo.FromModel(user)
if found { if found {
rspObj.UserInfo.HourlyEarnings = service.Chip.GetHourEarning(user.AccountId) rspObj.UserInfo.HourlyEarnings = service.Chip.GetHourEarning(user.AccountId)
} }
user.UpdateUserFields()
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }

134
server/wheelserver/model/user.go
View File

@ -11,26 +11,27 @@ import (
) )
type User struct { type User struct {
Idx int64 `gorm:"column:idx;AUTO_INCREMENT"` Idx int64 `gorm:"column:idx;AUTO_INCREMENT"`
AccountId string `gorm:"column:account_id;primaryKey"` AccountId string `gorm:"column:account_id;primaryKey"`
Uid string `gorm:"column:uid"` Uid string `gorm:"column:uid"`
Gid string `gorm:"column:gid"` Gid string `gorm:"column:gid"`
OpenId string `gorm:"column:openid"` OpenId string `gorm:"column:openid"`
Version int32 `gorm:"column:version"` Version int32 `gorm:"column:version"`
Avatar string `gorm:"column:avatar"` Avatar string `gorm:"column:avatar"`
NickName string `gorm:"column:nickname"` NickName string `gorm:"column:nickname"`
Invited string `gorm:"column:invited"` Invited string `gorm:"column:invited"`
Ext string `gorm:"column:ext"` Ext string `gorm:"column:ext"`
Plat int32 `gorm:"column:plat"` Plat int32 `gorm:"column:plat"`
PlatVip int32 `gorm:"column:plat_vip"` PlatVip int32 `gorm:"column:plat_vip"`
Score int64 `gorm:"column:score"` Score int64 `gorm:"column:score"`
Dice int32 `gorm:"column:dice"` Dice int32 `gorm:"column:dice"`
SpecDice int32 `gorm:"column:spec_dice"` SpecDice int32 `gorm:"column:spec_dice"`
LastPresentDiceTime int32 `gorm:"column:last_present_dice_time"` LastPresentDiceTime int32 `gorm:"column:last_present_dice_time"`
CurrGrid int32 `gorm:"column:curr_grid"` CurrGrid int32 `gorm:"column:curr_grid"`
AwardGrids string `gorm:"column:award_grids"` AwardGrids string `gorm:"column:award_grids"`
CreateTime int32 `gorm:"column:createtime;<-:create"` CreateTime int32 `gorm:"column:createtime;<-:create"`
ModifyTime int32 `gorm:"column:modifytime"` ModifyTime int32 `gorm:"column:modifytime"`
updatefields map[string]int `gorm:"-"`
} }
func (this *User) TableName() string { func (this *User) TableName() string {
@ -45,6 +46,30 @@ func (this *User) UpdateFields(fields []string) error {
return nil return nil
} }
func (this *User) UpdateUserFields() error {
if len(this.updatefields) == 0 {
return nil
}
fields := []string{}
for item := range this.updatefields {
fields = append(fields, item)
}
for k := range this.updatefields {
delete(this.updatefields, k)
}
return this.UpdateFields(fields)
}
func (this *User) AddFields(f string) {
if this.updatefields == nil {
this.updatefields = map[string]int{}
}
this.updatefields[f] = 1
}
func (this *User) Find(accountId string, nowTime int64) (error, bool) { func (this *User) Find(accountId string, nowTime int64) (error, bool) {
if result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(this.TableName()).Take( if result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(this.TableName()).Take(
this, "account_id = ?", accountId); result.Error != nil && this, "account_id = ?", accountId); result.Error != nil &&
@ -98,23 +123,26 @@ func (this *User) DecDice(num int32) error {
updatepresentTime = true updatepresentTime = true
} }
updatefileds := []string{"dice"} // updatefileds := []string{"dice"}
this.AddFields("dice")
if updatepresentTime { if updatepresentTime {
updatefileds = append(updatefileds, "last_present_dice_time") // updatefileds = append(updatefileds, "last_present_dice_time")
this.AddFields("last_present_dice_time")
} }
if err := this.UpdateFields(updatefileds); err != nil { // if err := this.UpdateFields(updatefileds); err != nil {
this.Dice = oldDice // this.Dice = oldDice
return err // return err
} // }
return nil return nil
} }
func (this *User) AddSpecDice(num int32) error { func (this *User) AddSpecDice(num int32) error {
this.SpecDice += num this.SpecDice += num
if err := this.UpdateFields([]string{"spec_dice"}); err != nil { // if err := this.UpdateFields([]string{"spec_dice"}); err != nil {
return err // return err
} // }
this.AddFields("spec_dice")
return nil return nil
} }
@ -122,12 +150,13 @@ func (this *User) DecSpecDice(num int32) error {
if this.SpecDice < num { if this.SpecDice < num {
return errors.New("") return errors.New("")
} }
oldSpecDice := this.SpecDice // oldSpecDice := this.SpecDice
this.SpecDice -= num this.SpecDice -= num
if err := this.UpdateFields([]string{"spec_dice"}); err != nil { // if err := this.UpdateFields([]string{"spec_dice"}); err != nil {
this.SpecDice = oldSpecDice // this.SpecDice = oldSpecDice
return err // return err
} // }
this.AddFields("spec_dice")
return nil return nil
} }
@ -135,12 +164,13 @@ func (this *User) DecScore(num int32) error {
if this.Score < int64(num) { if this.Score < int64(num) {
return errors.New("") return errors.New("")
} }
oldScore := this.Score // oldScore := this.Score
this.Score -= int64(num) this.Score -= int64(num)
if err := this.UpdateFields([]string{"score"}); err != nil { // if err := this.UpdateFields([]string{"score"}); err != nil {
this.Score = oldScore // this.Score = oldScore
return err // return err
} // }
this.AddFields("score")
return nil return nil
} }
@ -148,17 +178,21 @@ func (this *User) AddScore(score int32) error {
if score <= 0 { if score <= 0 {
return nil return nil
} }
oldScore := this.Score // oldScore := this.Score
this.Score += int64(score) this.Score += int64(score)
if err := this.UpdateFields([]string{"score"}); err != nil { // if err := this.UpdateFields([]string{"score"}); err != nil {
this.Score = oldScore // this.Score = oldScore
return err // return err
} // }
this.AddFields("score")
return nil return nil
} }
func (this *User) UpdateName() error { func (this *User) UpdateName(name string) error {
return this.UpdateFields([]string{"nickname"}) this.NickName = name
// return this.UpdateFields([]string{"nickname"})
this.AddFields("nickname")
return nil
} }
func (this *User) AddAwardGrid(gridid int32) error { func (this *User) AddAwardGrid(gridid int32) error {
@ -168,12 +202,16 @@ func (this *User) AddAwardGrid(gridid int32) error {
} }
this.AwardGrids += q5.SafeToString(gridid) this.AwardGrids += q5.SafeToString(gridid)
return this.UpdateFields([]string{"award_grids"}) // return this.UpdateFields([]string{"award_grids"})
this.AddFields("award_grids")
return nil
} }
func (this *User) ClearAwardGrid() error { func (this *User) ClearAwardGrid() error {
this.AwardGrids = "" this.AwardGrids = ""
return this.UpdateFields([]string{"award_grids"}) // return this.UpdateFields([]string{"award_grids"})
this.AddFields("award_grids")
return nil
} }
func (this *User) GetAwardGrids() []int32 { func (this *User) GetAwardGrids() []int32 {

1
server/wheelserver/service/award.go
View File

@ -32,6 +32,7 @@ func (this *award) AddItem(accountId string, itemId int32, itemNum int32, baseVo
baseVo.GetOrCreateSideEffect().User.FromModel(user) baseVo.GetOrCreateSideEffect().User.FromModel(user)
baseVo.GetOrCreateSideEffect().User.HourlyEarnings = Chip.GetHourEarning(user.AccountId) baseVo.GetOrCreateSideEffect().User.HourlyEarnings = Chip.GetHourEarning(user.AccountId)
} }
user.UpdateUserFields()
} }
return return
} }

10
server/wheelserver/service/buff.go
View File

@ -2,13 +2,12 @@ package service
import ( import (
"f5" "f5"
"main/model"
"main/constant" "main/constant"
"main/model"
"main/mt" "main/mt"
) )
type buff struct { type buff struct {
} }
func (this *buff) init() { func (this *buff) init() {
@ -18,15 +17,16 @@ func (this *buff) unInit() {
} }
func (this *buff) List(accountId string) (error, []*model.Buff) { func (this *buff) List(accountId string) (error, []*model.Buff) {
nowTime := f5.GetApp().GetRealSeconds()
buffs := []*model.Buff{} buffs := []*model.Buff{}
result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(new(model.Buff).TableName()).Where( result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(new(model.Buff).TableName()).Where(
"account_id = ?", accountId).Find(&buffs) "account_id = ? AND expiretime > ?", accountId, nowTime).Find(&buffs)
return result.Error, buffs return result.Error, buffs
} }
func (this *buff) Add(accountId string, buffList []int32) { func (this *buff) Add(accountId string, buffList []int32) {
nowTime := int32(f5.GetApp().GetRealSeconds()) nowTime := int32(f5.GetApp().GetRealSeconds())
for _, buffId := range(buffList) { for _, buffId := range buffList {
buffMeta := mt.Table.Buff.GetById(int64(buffId)) buffMeta := mt.Table.Buff.GetById(int64(buffId))
if buffMeta != nil { if buffMeta != nil {
buffModel := new(model.Buff) buffModel := new(model.Buff)
@ -60,7 +60,7 @@ func (this *buff) Add(accountId string, buffList []int32) {
func (this *buff) HasBuffEffect(accountId string, buffEffect int32) (error, bool) { func (this *buff) HasBuffEffect(accountId string, buffEffect int32) (error, bool) {
if err, buffs := this.List(accountId); err == nil { if err, buffs := this.List(accountId); err == nil {
for _, v := range(buffs) { for _, v := range buffs {
buffMeta := mt.Table.Buff.GetById(int64(v.BuffId)) buffMeta := mt.Table.Buff.GetById(int64(v.BuffId))
if buffMeta != nil && buffMeta.GetBuffEffect() == buffEffect { if buffMeta != nil && buffMeta.GetBuffEffect() == buffEffect {
return nil, true return nil, true

1
server/wheelserver/service/chip.go
View File

@ -98,6 +98,7 @@ func (this *chip) checkEarningLoop() {
userearning := this.CalcScore(accountId) userearning := this.CalcScore(accountId)
user.AddScore(userearning) user.AddScore(userearning)
Task.UpdateTaskProgress(accountId, constant.ITEM_TYPE_SCORE, userearning, nil) Task.UpdateTaskProgress(accountId, constant.ITEM_TYPE_SCORE, userearning, nil)
user.UpdateUserFields()
} }
} else { } else {
deletelist[accountId] = 0 deletelist[accountId] = 0

6
server/wheelserver/service/task.go
View File

@ -114,8 +114,12 @@ func (this *task) List(accountId string, data *[]*vo.Mission) (errcode int32, ms
for _, taskitem := range tasks { for _, taskitem := range tasks {
missionVo := new(vo.Mission) missionVo := new(vo.Mission)
missionVo.FromModel(taskitem) missionVo.FromModel(taskitem)
q5.AppendSlice(data, missionVo) q5.AppendSlice(data, missionVo)
} }
q5.Sort(*data, func(t *vo.Mission, m *vo.Mission) bool {
return t.MissionId < m.MissionId
})
} }
if tasksupdate { if tasksupdate {