新增奖励回调接口，调整奖励领取接口

internal/controller/reward/reward_v1_callback.go

@@ -8,6 +8,8 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/glog"
 	"server/api/reward/v1"
+	"server/internal/model"
+	"server/internal/service"
 	"strings"
 )
 
@@ -30,5 +32,29 @@ func (c *ControllerV1) Callback(ctx context.Context, req *v1.CallbackReq) (res *
 		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))
-	return &v1.CallbackRes{Errcode: 0, OrderId: req.OrderId, Datas: []v1.CallbackData{{PrizeCode: req.OrderId}}}, err
+
+	out, err := service.Reward().CallBack(ctx, &model.RewardCallbackIn{
+		Uid:            req.Uid,
+		CustomInfo:     req.CustomInfo,
+		OrderId:        req.OrderId,
+		PrizeChannelId: req.PrizeChannelId,
+		PrizeId:        req.PrizeId,
+		PrizeType:      int(req.PrizeType),
+		PrizeSubType:   int(req.PrizeSubType),
+		Num:            int(req.Num),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &v1.CallbackRes{
+		AppId:   appid,
+		Datas:   out.Datas,
+		Errcode: out.Errcode,
+		Errmsg:  out.Errmsg,
+		OrderId: out.OrderId,
+	}, nil
+
+	//return &v1.CallbackRes{Errcode: 0, OrderId: req.OrderId, Datas: []v1.CallbackData{{PrizeCode: req.OrderId}}}, err
 }

internal/controller/reward/reward_v1_get_lift.go

@@ -9,9 +9,13 @@ import (
 
 func (c *ControllerV1) GetLift(ctx context.Context, req *v1.GetLiftReq) (res *v1.GetLiftRes, err error) {
 	out, err := service.Reward().GetLift(ctx, &model.GetRewardIn{
-		GameId:  int(req.GameId),
-		TaskId:  req.TaskId,
-		PopenId: req.PopenId,
+		GameId:       int(req.GameId),
+		TaskId:       req.TaskId,
+		PopenId:      req.PopenId,
+		RewradTypeId: int(req.RewradType),
+		RoleIdx:      req.RoleIdx,
+		AreaId:       int(req.AreaId),
+		Source:       req.Source,
 	})
 
 	if err != nil {