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

Compare commits

base: denghui:1462018682afb8282de312a1123ad086f6f9a1d1
Branches Tags
denghui:master
...
compare: denghui:master
Branches Tags
denghui:master

3 Commits
1462018682 ... master

Author SHA1 Message Date
chy
8f35548fe2 调整奖励领取接口 2025-07-14 10:17:46 +08:00
chy
6aa28533bd Merge remote-tracking branch 'origin/master' 2025-07-12 19:06:06 +08:00
chy
7e93ce31a3 调整奖励回调接口 2025-07-12 19:05:56 +08:00
4 changed files with 28 additions and 25 deletions
Expand all files Collapse all files

2
internal/controller/reward/reward_v1_callback.go
View File

@ -54,6 +54,8 @@ func (c *ControllerV1) Callback(ctx context.Context, req *v1.CallbackReq) (res *
return nil, nil
}
glog.Infof(ctx, "回调响应：%s", marshal)
g.RequestFromCtx(ctx).Response.Write(marshal)
return nil, nil
}

2
internal/controller/task/task_v1_get_task_list.go
View File

@ -29,7 +29,7 @@ func (c *ControllerV1) GetTaskList(ctx context.Context, req *v1.GetTaskListReq)
if err != nil {
return nil, err
}
glog.Infof(ctx, "The return task length of Game %d: %d", req.Gid, len(list.Data))
glog.Info(ctx, list)
return &v1.GetTaskListRes{
List: list,

48
internal/logic/reward/reward.go
View File

@ -608,30 +608,30 @@ func (s *sReward) GetLift(ctx context.Context, in *model.GetRewardIn) (out *mode
//if err2 != nil {
if err2 != nil && err2.Error() == "奖励领取超出限制,-1" {
// 修改奖励领取状态为5
_, err2 = dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{Id: in.Id}).Data(do.UserTaskRewards{
Status: consts.RewardFailedStatus,
}).Update()
if err2 != nil {
return nil, ecode.Fail.Sub("修改用奖励领取状态失败")
}
// 判断奖励是否领完,修改用户任务记录为 2
exist, err2 := dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{UserTaskId: in.UserTaskId}).WhereIn(dao.UserTaskRewards.Columns().Status, []int{2, 3}).Exist()
if err2 != nil {
return nil, ecode.Fail.Sub("查询用户任务奖励失败")
}
if !exist {
// 修改用户任务记录为 2
_, err2 = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{Id: in.UserTaskId}).Data(do.UserTasks{
Status: 2,
}).Update()
if err2 != nil {
return nil, ecode.Fail.Sub("修改用户任务状态失败")
}
}
//_, err2 = dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{Id: in.Id}).Data(do.UserTaskRewards{
// Status: consts.RewardFailedStatus,
//}).Update()
//
//if err2 != nil {
// return nil, ecode.Fail.Sub("修改用奖励领取状态失败")
//}
//
//// 判断奖励是否领完,修改用户任务记录为 2
//exist, err2 := dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{UserTaskId: in.UserTaskId}).WhereIn(dao.UserTaskRewards.Columns().Status, []int{2, 3}).Exist()
//if err2 != nil {
// return nil, ecode.Fail.Sub("查询用户任务奖励失败")
//}
//
//if !exist {
// // 修改用户任务记录为 2
// _, err2 = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{Id: in.UserTaskId}).Data(do.UserTasks{
// Status: 2,
// }).Update()
//
// if err2 != nil {
// return nil, ecode.Fail.Sub("修改用户任务状态失败")
// }
//}
return nil, ecode.RewardExceedLimited
} else if err2 != nil {

1
internal/logic/task/task.go
View File

@ -500,6 +500,7 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out
if !ok {
return nil, ecode.Fail.Sub("数据类型转换失败")
}
glog.Infof(ctx, "The tencent task length of Game %d: %d", in.Gid, len(result.TaskList))
for i, v := range result.TaskList {
// 获取任务奖励列表
err := dao.TaskRewards.Ctx(ctx).Where(do.TaskRewards{TaskId: v.TaskID}).WhereOr(do.TaskRewards{TaskId: v.TaskID, NetbarAccount: in.NetBarAccount}).