Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/model/userTaskReward.go

internal/controller/reward/reward_v1_get_user_rewards_can_claim_list.go

@@ -0,0 +1,19 @@
+package reward
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+	"server/internal/model"
+	"server/internal/service"
+
+	"server/api/reward/v1"
+)
+
+func (c *ControllerV1) GetUserRewardsCanClaimList(ctx context.Context, req *v1.GetUserRewardsCanClaimListReq) (res *v1.GetUserRewardsCanClaimListRes, err error) {
+	userId := g.RequestFromCtx(ctx).GetCtxVar("id").Int64()
+	out, err := service.Reward().GetUserClaimList(ctx, &model.GetUserClaimListIn{NetbarAccount: req.NetbarAccount, StoreId: req.StoreId, TaskId: req.TaskId, UserId: userId})
+	if err != nil {
+		return nil, err
+	}
+	return &v1.GetUserRewardsCanClaimListRes{List: out.List, Total: out.Total}, nil
+}