From e9b29d0e6b7f1ea1cde669da1dc229fb66461143 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Tue, 20 Sep 2022 20:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/v2/ui/views/task_activelist.go |  2 +-
 modules/task/api_activereceive.go  | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cmd/v2/ui/views/task_activelist.go b/cmd/v2/ui/views/task_activelist.go
index 77bf8ddcf..3bf02eb03 100644
--- a/cmd/v2/ui/views/task_activelist.go
+++ b/cmd/v2/ui/views/task_activelist.go
@@ -56,7 +56,7 @@ func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject
 		}
 		if err := service.GetPttService().SendToClient(
 			t.MainType, "activereceive",
-			&pb.TaskReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
+			&pb.TaskActiveReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
 			logrus.Error(err)
 			return
 		}
diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go
index d9cf53fdf..6aee401c6 100644
--- a/modules/task/api_activereceive.go
+++ b/modules/task/api_activereceive.go
@@ -63,10 +63,23 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
 		return
 	}
 
-	if ue.Activeday >= conf.Active {
-		update := map[string]interface{}{
-			"received": 1, //标识已领取
+	update := make(map[string]interface{})
+	if req.TaskTag == int32(comm.TASK_DAILY) {
+		if ue.Activeday >= conf.Active {
+			update["received"] = 1
+		} else {
+			code = pb.ErrorCode_TaskActiveNoenough
+			return
 		}
+	} else if req.TaskTag == int32(comm.TASK_WEEKLY) {
+		if ue.Activeweek >= conf.Active {
+			update["received"] = 1
+		} else {
+			code = pb.ErrorCode_TaskActiveNoenough
+			return
+		}
+	}
+	if len(update) > 0 {
 		if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(),
 			ua.Id,
 			comm.TaskTag(req.TaskTag),
@@ -75,9 +88,6 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
 			code = pb.ErrorCode_DBError
 			return
 		}
-	} else {
-		code = pb.ErrorCode_TaskActiveNoenough
-		return
 	}
 
 	//派发奖励