diff --git a/server/wheelserver/api/v1/activity/activity.go b/server/wheelserver/api/v1/activity/activity.go index f27e7c04..90e31e67 100644 --- a/server/wheelserver/api/v1/activity/activity.go +++ b/server/wheelserver/api/v1/activity/activity.go @@ -148,15 +148,15 @@ func (this *ActivityApi) RollDice(c *gin.Context) { bageffect, taskupdate, bufeffect := service.Award.HandleAwards(user, rspObj.GetOrCreateAward()) if bageffect { - q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, "bag") + q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BAG) } if bufeffect { - q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, "buff") + q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BUFF) } if fullgrid { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "fullgrid") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_FULL_GRID) } itemtype := constant.ITEM_TYPE_SPEC_DICE @@ -165,7 +165,7 @@ func (this *ActivityApi) RollDice(c *gin.Context) { } if service.Task.UpdateTaskProgress(s.GetAccountId(), constant.TASK_COND_BACK_USE, int32(itemtype), 1, nil) || taskupdate { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user) @@ -221,15 +221,15 @@ func (this *ActivityApi) Claim(c *gin.Context) { bageffect, taskupdate, bufeffect := service.Award.HandleAwards(user, rspObj.GetOrCreateAward()) if bageffect { - q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, "bag") + q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BAG) } if bufeffect { - q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, "buff") + q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BUFF) } if taskupdate { - q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } rspObj.GetOrCreateSideEffect().GetOrCreateUser().FromModel(user) diff --git a/server/wheelserver/api/v1/bag/bag.go b/server/wheelserver/api/v1/bag/bag.go index 75d4ca03..5bf7c64e 100644 --- a/server/wheelserver/api/v1/bag/bag.go +++ b/server/wheelserver/api/v1/bag/bag.go @@ -80,10 +80,10 @@ func (this *BagApi) UseItem(c *gin.Context) { } service.Buff.Add(s.GetAccountId(), itemMeta.GetBuffList()) bagItem.DecItemNum(1, int32(nowTime)) - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "buff") - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "bag") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BUFF) + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_BAG) if service.Task.UpdateTaskProgress(s.GetAccountId(), constant.TASK_COND_BACK_USE, itemMeta.GetItemType(), reqJson.ItemNum, nil) { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } c.JSON(200, rspObj) } diff --git a/server/wheelserver/api/v1/mission/mission.go b/server/wheelserver/api/v1/mission/mission.go index e07b926b..41a71aca 100644 --- a/server/wheelserver/api/v1/mission/mission.go +++ b/server/wheelserver/api/v1/mission/mission.go @@ -149,7 +149,7 @@ func (this *MissionApi) ClaimTaskAward(c *gin.Context) { if taskMeta.GetRewardType() == constant.TASK_AWARD_SCORE { user.AddScore(taskMeta.GetReward()) if service.Task.UpdateTaskProgress(s.GetAccountId(), constant.TASK_COND_BACK_GAIN, constant.ITEM_TYPE_SCORE, taskMeta.GetReward(), &tasks) { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } rspObj.GetOrCreateAward().AddItem(constant.VIRTUAL_ITEM_SCORE, taskMeta.GetReward()) } diff --git a/server/wheelserver/api/v1/shop/shop.go b/server/wheelserver/api/v1/shop/shop.go index ef7c962f..3914d7d9 100644 --- a/server/wheelserver/api/v1/shop/shop.go +++ b/server/wheelserver/api/v1/shop/shop.go @@ -98,7 +98,7 @@ func (this *ShopApi) Buy(c *gin.Context) { rspObj.SideEffect.User.FromModel(user) rspObj.SideEffect.User.HourlyEarnings = service.Chip.GetHourEarning(user.AccountId) if service.Task.UpdateTaskProgress(s.GetAccountId(), constant.TASK_COND_BACK_BUY, itemMeta.GetItemType(), 1, nil) { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } user.UpdateUserFields() diff --git a/server/wheelserver/api/v1/user/user.go b/server/wheelserver/api/v1/user/user.go index db07f693..c93856de 100644 --- a/server/wheelserver/api/v1/user/user.go +++ b/server/wheelserver/api/v1/user/user.go @@ -80,7 +80,7 @@ func (this *UserApi) Login(c *gin.Context) { if earning > 0 { user.AddScore(earning) if service.Task.UpdateTaskProgress(s.GetAccountId(), constant.TASK_COND_BACK_GAIN, constant.ITEM_TYPE_SCORE, earning, nil) { - q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, "task") + q5.AppendSlice(&rspObj.BaseVo.GetOrCreateSideEffect().Effects, constant.SIDE_EFFECT_Task) } } } diff --git a/server/wheelserver/constant/constant.go b/server/wheelserver/constant/constant.go index 90dd8072..3a9ef7fe 100644 --- a/server/wheelserver/constant/constant.go +++ b/server/wheelserver/constant/constant.go @@ -43,6 +43,8 @@ const ( const ( SIDE_EFFECT_BUFF = "buff" SIDE_EFFECT_BAG = "bag" + SIDE_EFFECT_Task = "task" + SIDE_EFFECT_FULL_GRID = "fullgrid" ) const ( diff --git a/server/wheelserver/model/log.go b/server/wheelserver/model/log.go index b479bb29..e5436124 100644 --- a/server/wheelserver/model/log.go +++ b/server/wheelserver/model/log.go @@ -6,16 +6,16 @@ import ( ) type Log struct { - Idx int64 `gorm:"column:idx;AUTO_INCREMENT;primaryKey"` - AccountId string `gorm:"column:account_id"` - Type string `gorm:"column:type"` - SubType string `gorm:"column:sub_type"` - Param1 string `gorm:"column:param1"` - Param2 string `gorm:"column:param2"` - Param3 string `gorm:"column:param3"` - Param4 string `gorm:"column:param4"` - CreateTime int32 `gorm:"column:createtime;<-:create"` - ModifyTime int32 `gorm:"column:modifytime"` + Idx int64 `gorm:"column:idx;AUTO_INCREMENT;primaryKey"` + AccountId string `gorm:"column:account_id"` + Type string `gorm:"column:type;comment:item id"` + SubType string `gorm:"column:sub_type;comment:变化来源"` + Param1 string `gorm:"column:param1;comment:变化量"` + Param2 string `gorm:"column:param2;comment:变化后"` + Param3 string `gorm:"column:param3"` + Param4 string `gorm:"column:param4"` + CreateTime int32 `gorm:"column:createtime;<-:create"` + ModifyTime int32 `gorm:"column:modifytime"` } func (this *Log) TableName() string {