修复不同类型的判断

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
 		}

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 := make(map[string]interface{})
-		update := map[string]interface{}{
+	if req.TaskTag == int32(comm.TASK_DAILY) {
-			"received": 1, //标识已领取
+		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
 	}
 
 	//派发奖励