diff --git a/api/reward/v1/reward.go b/api/reward/v1/reward.go index e9ac01a..bae2475 100644 --- a/api/reward/v1/reward.go +++ b/api/reward/v1/reward.go @@ -191,6 +191,7 @@ type GetLiftReq struct { GameId int64 `json:"gid" v:"required#游戏id不能为空" dc:"游戏Id"` RoleIdx string `json:"roleIdx" dc:"角色索引"` RewradType []int64 `json:"rewardType" v:"required#奖励类型不能为空" dc:"奖励类型"` + Water Water `json:"water" v:"required#物品流水,从背包列表获取的water透传回来(water类型参考GetGift接口的water结构)" dc:"礼包列表"` } type GetLiftRes struct { diff --git a/api/task/v1/task.go b/api/task/v1/task.go index befdfb2..4417dc8 100644 --- a/api/task/v1/task.go +++ b/api/task/v1/task.go @@ -64,7 +64,7 @@ type ListRes struct { // SelectorReq 系统管理员任务列表二级选择器 type SelectorReq struct { - g.Meta `path:"/task/selector" method:"get" tags:"Task" summary:"(PC)系统管理员任务列表二级选择器"` + g.Meta `path:"/task/selector" method:"get" tags:"Task" summary:"系统管理员任务列表二级选择器"` } type SelectorRes struct { diff --git a/internal/controller/reward/reward_v1_get_lift.go b/internal/controller/reward/reward_v1_get_lift.go index 41b1c70..c93346b 100644 --- a/internal/controller/reward/reward_v1_get_lift.go +++ b/internal/controller/reward/reward_v1_get_lift.go @@ -7,11 +7,10 @@ import ( func (c *ControllerV1) GetLift(ctx context.Context, req *v1.GetLiftReq) (res *v1.GetLiftRes, err error) { //out, err := service.Reward().GetLift(ctx, &model.GetGoodsGetIn{ - // AreaId: req.AreaId, - // GameId: req.GameId, - // RewradTypeId: req.RewradType, - // RoleIdx: req.RoleIdx, - // TaskId: req.TaskId, + // Water: req.Water, + // AreaId: req.AreaId, + // GameId: req.GameId, + // RoleIdx: req.RoleIdx, //}) // //if err != nil { diff --git a/internal/controller/upload/upload_v1_upload_user_img.go b/internal/controller/upload/upload_v1_upload_user_img.go index 73dd39f..a1bf8f1 100644 --- a/internal/controller/upload/upload_v1_upload_user_img.go +++ b/internal/controller/upload/upload_v1_upload_user_img.go @@ -2,16 +2,13 @@ package upload import ( "context" - "server/internal/model" - "server/internal/service" - "server/api/upload/v1" ) func (c *ControllerV1) UploadUserImg(ctx context.Context, req *v1.UploadUserImgReq) (res *v1.UploadUserImgRes, err error) { - upload, err := service.Upload().UploadGameImg(ctx, &model.UploadIn{File: req.File}) - if err != nil { - return nil, err - } - return &v1.UploadUserImgRes{Url: upload.Url}, nil + //upload, err := service.Upload().UploadGameImg(ctx, &model.UploadIn{File: req.File}) + //if err != nil { + // return nil, err + //} + return &v1.UploadUserImgRes{Url: "这是头像图片"}, nil } diff --git a/internal/logic/user/user.go b/internal/logic/user/user.go index aa274dc..aff470b 100644 --- a/internal/logic/user/user.go +++ b/internal/logic/user/user.go @@ -165,7 +165,7 @@ func (s *sUser) Info(ctx context.Context, in *model.UserInfoIn) (out *model.User func (s *sUser) Code(ctx context.Context, in *model.GetPhoneCodeIn) (out *model.GetPhoneCodeOut, err error) { // TODO 短信平台获取验证码 - code := "9999" + code := "123456" // 存入 redis err = g.Redis().SetEX(ctx, fmt.Sprintf(consts.UserBindPhoneKey, in.Id), code, consts.UserCodeExpire)