Merge remote-tracking branch 'origin/master'

internal/logic/reward/reward.go

@@ -605,9 +605,40 @@ func (s *sReward) GetLift(ctx context.Context, in *model.GetRewardIn) (out *mode
 		glog.Info(ctx, "调用 tencent开始")
 		activity, err2 := gamelife.GetGamelifeClient(ctx).RequestActivity(ctx, &model.QQNetbarActivityIn{PopenId: in.PopenId, ServiceName: consts.GetGift, GiftParam: giftParam})
 
-		if err2 != nil {
+		//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("修改用户任务状态失败")
+				}
+			}
+
+			return nil, ecode.RewardExceedLimited
+		} else if err2 != nil {
 			return nil, err2
 		}
+		//return nil, err2
+		//}
 		glog.Info(ctx, "调用 tencent结束")
 		fmt.Print(activity)