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-06-23 16:10:36 +08:00
parent bbd3968429
commit effc4113dc
29 changed files with 495 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,16 @@ func (c *ControllerV1) Callback(ctx context.Context, req *v1.CallbackReq) (res *
timestamp := fromCtx.Header.Get("Custom-Data-Timestamp")
nonce := fromCtx.Header.Get("Custom-Data-Nonce")
auth := fromCtx.Header.Get("Custom-Data-Auth")
glog.Infof(ctx, fmt.Sprintf("appid:%s,timestamp:%s,nonce:%s,auth:%s", appid, timestamp, nonce, auth))
data := fmt.Sprintf("%s%s%s%s%d%d%d%s%s%s#%s", req.Uid, req.OrderId, req.PrizeChannelId, req.PrizeId, req.PrizeType, req.PrizeSubType, req.Num, appid, timestamp, nonce, auth)
stateOri := md5.Sum([]byte(data))
state := hex.EncodeToString(stateOri[:])
myAuth := strings.ToUpper(state)
glog.Infof(ctx, fmt.Sprintf("myAuth:%s,auth:%s", myAuth, auth))
if myAuth != auth {
glog.Infof(ctx, fmt.Sprintf("myAuth:%s,auth:%s", myAuth, auth))
return &v1.CallbackRes{Errcode: 252151000, OrderId: req.OrderId, Datas: []v1.CallbackData{{PrizeCode: req.OrderId}}}, err
}
glog.Infof(ctx, fmt.Sprintf("%s,%s,%s,%s,%d,%d,%d,%s,%s,%s,#%s", req.Uid, req.OrderId, req.PrizeChannelId, req.PrizeId, req.PrizeType, req.PrizeSubType, req.Num, appid, timestamp, nonce, auth))

4
internal/controller/reward/reward_v1_get_goods_details.go
View File

@ -10,7 +10,7 @@ import (
func (c *ControllerV1) GetGoodsDetails(ctx context.Context, req *v1.GetGoodsDetailsReq) (res *v1.GetGoodsDetailsRes, err error) {
_, err = service.Reward().GetGoodsDetails(ctx, &model.QueryUserGoodsDetailParam{
out, err := service.Reward().GetGoodsDetails(ctx, &model.QueryUserGoodsDetailParam{
WinningTime: req.Winningtime,
OrderId: req.Orderid,
IsActInfo: req.IsActinfo,
@ -22,5 +22,5 @@ func (c *ControllerV1) GetGoodsDetails(ctx context.Context, req *v1.GetGoodsDeta
return nil, err
}
return &v1.GetGoodsDetailsRes{Water: nil}, nil
return &v1.GetGoodsDetailsRes{Water: out.Water}, nil
}

30
internal/controller/reward/reward_v1_get_lift.go
View File

@ -3,22 +3,22 @@ package reward
import (
"context"
"server/api/reward/v1"
"server/internal/model"
"server/internal/service"
)
func (c *ControllerV1) GetLift(ctx context.Context, req *v1.GetLiftReq) (res *v1.GetLiftRes, err error) {
//out, err := service.Reward().GetLift(ctx, &model.GetGoodsGetIn{
// Water: req.Water,
// AreaId: req.AreaId,
// GameId: req.GameId,
// RoleIdx: req.RoleIdx,
//})
//
//if err != nil {
// return nil, err
//}
//return &v1.GetLiftRes{
// List: out.List,
// Result: out.Result,
//}, nil
return nil, err
out, err := service.Reward().GetLift(ctx, &model.GetRewardIn{
GameId: int(req.GameId),
TaskId: req.TaskId,
PopenId: req.PopenId,
})
if err != nil {
return nil, err
}
return &v1.GetLiftRes{
List: out.List,
Result: int64(out.Result),
}, nil
}