From a3ed25808b1a596fe2390b04033204f68deb4e79 Mon Sep 17 00:00:00 2001
From: denghui <1016848185@qq.com>
Date: Thu, 19 Jun 2025 09:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=A5=96=E5=8A=B1=E3=80=81=E5=B0=81=E8=A3=85=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/storeTaskReward/v1/storeTaskReward.go |  6 +++---
 internal/model/storeTaskReward.go         |  6 +++---
 utility/gamelife/gamelife.go              | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/api/storeTaskReward/v1/storeTaskReward.go b/api/storeTaskReward/v1/storeTaskReward.go
index 8074d29..b6a30f3 100644
--- a/api/storeTaskReward/v1/storeTaskReward.go
+++ b/api/storeTaskReward/v1/storeTaskReward.go
@@ -4,9 +4,9 @@ import "github.com/gogf/gf/v2/frame/g"
 
 type CreateReq struct {
 	g.Meta   `path:"/storeTaskReward" method:"post" tags:"StoreTaskReward" summary:"(商户、门店后台)创建门店任务奖励"`
-	TaskId   int64 `json:"taskId" v:"required#门店任务ID不能为空" dc:"门店任务ID"`
-	RewardId int64 `json:"rewardId" v:"required#奖励ID不能为空" dc:"奖励ID"`
-	StoreId  int64 `json:"storeId" v:"required#门店ID不能为空" dc:"门店ID"`
+	TaskId   string `json:"taskId" v:"required#任务 Id 不能为空" dc:"任务 Id"`
+	RewardId int64  `json:"rewardId" v:"required#奖励ID不能为空" dc:"奖励ID"`
+	StoreId  int64  `json:"storeId" v:"required#门店ID不能为空" dc:"门店ID"`
 }
 
 type CreateRes struct {
diff --git a/internal/model/storeTaskReward.go b/internal/model/storeTaskReward.go
index eb69996..802ba33 100644
--- a/internal/model/storeTaskReward.go
+++ b/internal/model/storeTaskReward.go
@@ -17,9 +17,9 @@ type StoreTaskReward struct {
 type StoreTaskRewardCreateIn struct {
 	OperatorId   int64
 	OperatorRole string
-	TaskId       int64 // 门店任务ID
-	RewardId     int64 // 奖励ID
-	StoreId      int64 // 门店ID
+	TaskId       string // 门店任务ID
+	RewardId     int64  // 奖励ID
+	StoreId      int64  // 门店ID
 }
 
 // StoreTaskRewardCreateOut 创建任务奖励关联出参
diff --git a/utility/gamelife/gamelife.go b/utility/gamelife/gamelife.go
index b6d85af..a3235fb 100644
--- a/utility/gamelife/gamelife.go
+++ b/utility/gamelife/gamelife.go
@@ -330,8 +330,21 @@ func (s *gamelifeClient) RequestActivity(ctx context.Context, in *model.QQNetbar
 		}
 		return &result, nil
 	case consts.GetTaskList:
+		result := model.GameTaskResponse{}
+		in.TaskParam.BrandId = s.BrandId
+		resp, err := client.R().
+			SetContext(ctx).
+			SetBody(in.TaskParam).
+			SetResult(&result).
+			Post(s.taskUrlMap[s.Mode] + consts.GetTaskList)
+		if err != nil {
+			return nil, ecode.Fail.Sub("请求出现异常")
+		}
+		if resp.IsError() {
+			return nil, ecode.Fail.Sub("请求失败")
+		}
+		return &result, nil
 
-		return nil, nil
 	default:
 		return nil, ecode.Fail.Sub("不支持的任务")
 	}