denghui/arenax-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整回调，奖励领取

Browse Source
This commit is contained in:
chy
2025-07-03 13:40:53 +08:00
parent 6e562de6df
commit 4f9afe5df5
15 changed files with 722 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/model/do/task_rewards.go
View File

@ -10,7 +10,9 @@ import (
// TaskRewards is the golang structure of table task_rewards for DAO operations like Where/Data.
type TaskRewards struct {
g.Meta `orm:"table:task_rewards, do:true"`
TaskId interface{} // 任务ID
RewardId interface{} // 奖励ID
g.Meta `orm:"table:task_rewards, do:true"`
TaskId interface{} // 任务ID
RewardId interface{} // 奖励ID
NetbarAccount interface{} // 门店网关账号
StoreId interface{} // 门店 id
}

3
internal/model/do/user_task_rewards.go
View File

@ -24,4 +24,7 @@ type UserTaskRewards struct {
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 软删除时间
ExpiredAt *gtime.Time // 奖励过期时间
IssueQuantity interface{} //
Source interface{} // 来源 1:系统 2：门店
RewardTypeId interface{} // 奖励类型 id
}

6
internal/model/entity/task_rewards.go
View File

@ -6,6 +6,8 @@ package entity
// TaskRewards is the golang structure for table task_rewards.
type TaskRewards struct {
TaskId string `json:"taskId" orm:"task_id" description:"任务ID"` // 任务ID
RewardId int64 `json:"rewardId" orm:"reward_id" description:"奖励ID"` // 奖励ID
TaskId string `json:"taskId" orm:"task_id" description:"任务ID"` // 任务ID
RewardId int64 `json:"rewardId" orm:"reward_id" description:"奖励ID"` // 奖励ID
NetbarAccount string `json:"netbarAccount" orm:"netbar_account" description:"门店网关账号"` // 门店网关账号
StoreId int `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id
}

3
internal/model/entity/user_task_rewards.go
View File

@ -22,4 +22,7 @@ type UserTaskRewards struct {
UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"` // 更新时间
DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"软删除时间"` // 软删除时间
ExpiredAt *gtime.Time `json:"expiredAt" orm:"expired_at" description:"奖励过期时间"` // 奖励过期时间
IssueQuantity int `json:"issueQuantity" orm:"issue_quantity" description:""` //
Source int64 `json:"source" orm:"source" description:"来源 1:系统 2：门店"` // 来源 1:系统 2：门店
RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型 id"` // 奖励类型 id
}

36
internal/model/gamelife.go
View File

@ -27,11 +27,11 @@ type GameTaskConfigParse struct {
}
type GameTask struct {
RuleDesc string `json:"rule_desc"`
TaskDesc string `json:"task_desc"`
LimitPrize int `json:"-"`
LimitNum int `json:"-"`
//PrizeList []Prize `json:"prize_list"`
RuleDesc string `json:"rule_desc"`
TaskDesc string `json:"task_desc"`
LimitPrize int `json:"-"`
LimitNum int `json:"-"`
PrizeList []Prize `json:"prize_list,omitempty"`
TaskID string `json:"task_id"`
Title string `json:"title"`
CycleStart int64 `json:"cycle_start"`
@ -42,7 +42,8 @@ type GameTask struct {
UserTimes int64 `json:"user_times"`
GameTaskConfig GameTaskConfig `json:"game_task_config"`
GameTaskConfigParse GameTaskConfigParse `json:"game_task_config_parse"`
Reward []SimpleReward `json:"reward"`
Rewards []SimpleReward `json:"rewards"`
UserTaskId int64 `json:"userTaskId" orm:"-"`
}
type GameTaskResponse struct {
@ -164,9 +165,7 @@ type premiumPrivInfo struct {
type goodsType int64
type goodsDisplayType struct {
// FIXME
}
type goodsDisplayType int64
type merchantInfo struct {
// FIXME
@ -201,14 +200,17 @@ type privCoupon struct {
Url string `json:"url"`
}
type goodsExtraInfo struct {
OlCouponCfg olCouponCfg `json:"olcoupon_cfg"`
GoodsBrandInfo goodsBrandInfo `json:"goods_brand_info"`
ExpireType int `json:"expire_type"`
ExpireConfig expireConfig `json:"expire_config"`
MprocJmpCfg map[string]any `json:"mproc_jmp_cfg"` // 空对象可用 map[string]any 表示
ApplyGoods string `json:"apply_goods"`
NewlyBuilt bool `json:"newly_built"`
PrivCoupon privCoupon `json:"priv_coupon"`
OlCouponCfg olCouponCfg `json:"olcoupon_cfg"`
GoodsBrandInfo goodsBrandInfo `json:"goods_brand_info"`
ExpireType int `json:"expire_type"`
ExpireConfig expireConfig `json:"expire_config"`
MprocJmpCfg map[string]any `json:"mproc_jmp_cfg"` // 空对象可用 map[string]any 表示
ApplyGoods string `json:"apply_goods"`
NewlyBuilt bool `json:"newly_built"`
PrivCoupon privCoupon `json:"priv_coupon"`
SpecialStatement string `json:"special_statement"`
MoneyScoreInfo map[string]any `json:"money_score_info"`
GoodsPrice string `json:"goods_price"`
}
type water struct {

22
internal/model/reward.go
View File

@ -50,7 +50,21 @@ type SimpleReward struct {
UserDailyLimit uint64 `json:"userDailyLimit" orm:"user_daily_limit" description:"用户每日领取限制（NULL表示不限制）"` // 用户每日领取限制（NULL表示不限制）
UserTotalLimit uint64 `json:"userTotalLimit" orm:"user_total_limit" description:"用户领取总次数限制（NULL表示不限制）"` // 用户领取总次数限制（NULL表示不限制）
ReceivedNum uint64 `json:"receivedNum" orm:"received_num" description:"已领取数量"` // 已领取数量
//GrantQuantity uint64 `json:"grantQuantity" orm:"grant_quantity" description:"每次发放个数"` // 每次发放个数
GrantQuantity uint64 `json:"grantQuantity" orm:"grant_quantity" description:"每次发放个数"` // 每次发放个数
}
type RewardCallback struct {
Id int64 `json:"id" orm:"id" description:""` //
Uid string `json:"uid" orm:"uid" description:"用户账号"` // 用户账号
OrderId string `json:"orderId" orm:"order_id" description:"订单号必须保证全局唯一(保证接口幂等)"` // 订单号必须保证全局唯一(保证接口幂等)
PrizeChannelId string `json:"prizeChannelId" orm:"prize_channel_id" description:"券渠道 ID"` // 券渠道 ID
PrizeId string `json:"prizeId" orm:"prize_id" description:"券 ID"` // 券 ID
PrizeType int `json:"prizeType" orm:"prize_type" description:"奖励类型，1 网鱼积分，2 网鱼经验值，3 网鱼兑换码"` // 奖励类型，1 网鱼积分，2 网鱼经验值，3 网鱼兑换码
PrizeSubType int `json:"prizeSubType" orm:"prize_sub_type" description:"奖励子类型，默认为 0，有多种子类型时可用，如 1,5 元网费充值券，2、满 30-5 满减券等"` // 奖励子类型，默认为 0，有多种子类型时可用，如 1,5 元网费充值券，2、满 30-5 满减券等
Num int `json:"num" orm:"num" description:"奖励个数，默认 1，比如经验值 10"` // 奖励个数，默认 1，比如经验值 10
CustomInfo string `json:"customInfo" orm:"custom_info" description:"透传字段 (json串)"` // 透传字段 (json串)
AppId string `json:"appId" orm:"app_id" description:"业务 id（标识业务方，由游戏人生提供）"` // 业务 id（标识业务方，由游戏人生提供）
InnerOrderId string `json:"innerOrderId" orm:"inner_order_id" description:"系统内部订单ID"` // 系统内部订单ID
}
// RewardCreateIn 创建奖励入参
@ -169,8 +183,10 @@ type CallbackData struct {
}
type GetRewardIn struct {
Id int
AreaId int
GameId int
GameCode string
RewradTypeId int
RewardId int
RoleIdx string
@ -182,7 +198,9 @@ type GetRewardIn struct {
UserId int
}
type GetRewardOut struct {
List []GetRewardNewOut `json:"list"`
//List []GetRewardNewOut `json:"list"`
Result int64 `json:"result"`
Url string `json:"url"`
}
type GetRewardNewOut struct {

4
internal/model/task.go
View File

@ -140,6 +140,6 @@ type GetTaskListV2In struct {
}
type GetTaskListV2Out struct {
PageIdx string `json:"pageidx"`
Data interface{} `json:"taskList"`
PageIdx string `json:"pageidx"`
Data []GameTask `json:"taskList"`
}

5
internal/model/userTaskReward.go
View File

@ -14,7 +14,7 @@ type GetUserClaimListIn struct {
}
type GetUserClaimListOut struct {
List []UserClaimReward
List []UserTaskRewards
Total int
}
@ -31,6 +31,9 @@ type UserTaskRewards struct {
UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"` // 更新时间
DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"软删除时间"` // 软删除时间
ExpiredAt *gtime.Time `json:"expiredAt" orm:"expired_at" description:"奖励过期时间"` // 奖励过期时间
IssueQuantity int `json:"issueQuantity" orm:"issue_quantity" description:""` //
Source int64 `json:"source" orm:"source" description:"来源 1:系统 2：门店"` // 来源 1:系统 2：门店
RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型 id"`
}
type UserClaimReward struct {