消息通知改到个人

service/task/sync_data.go

@@ -197,8 +197,9 @@ func (s *SyncData) SyncTaskData() {
 					lastPayAddNumKey := fmt.Sprintf(LastPayAddNumKey, date, gameTask.TaskId)
 					_ = s.cache.SetCacheStr(context.Background(), lastPayAddNumKey, gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget)
 					payErrAddNumKey := fmt.Sprintf(PayErrAddNumKey, date, gameTask.TaskId)
-					s.common.SaveGameAddFee(gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget, gameTarget.PayTarget, gameTask.TaskName)
-					go s.FreeSendMsg(gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget, gameTarget.PayTarget, gameTask.TaskName, gameTask.User)
+					diffNum := gameTarget.PayTarget - completeTaskData[gameTask.TaskId].PayTarget
+					s.common.SaveGameAddFee(diffNum, gameTarget.PayTarget, gameTask.TaskName)
+					go s.FreeSendMsg(diffNum, gameTarget.PayTarget, gameTask.TaskName, gameTask.User)
 					// 如果当前付费目标完成，加入一下逻辑
 					if completeTaskData[gameTask.TaskId].PayTarget <= completeTaskData[gameTask.TaskId].PayComplete {
 						lastPayCompletedUpdateTimeKey := fmt.Sprintf(LastPayCompletedUpdateTimeKey, date, gameTask.TaskId)
@@ -232,8 +233,9 @@ func (s *SyncData) SyncTaskData() {
 					lastPayAddNumKey := fmt.Sprintf(LastPayAddNumKey, date, gameTask.TaskId)
 					_ = s.cache.SetCacheStr(context.Background(), lastPayAddNumKey, gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget)
 					payErrAddNumKey := fmt.Sprintf(PayErrAddNumKey, date, gameTask.TaskId)
-					s.common.SaveGameAddFee(gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget, gameTarget.PayTarget, gameTask.TaskName)
-					go s.FreeSendMsg(gameTarget.PayTarget-completeTaskData[gameTask.TaskId].PayTarget, gameTarget.PayTarget, gameTask.TaskName, gameTask.User)
+					diffNum := gameTarget.PayTarget - completeTaskData[gameTask.TaskId].PayTarget
+					s.common.SaveGameAddFee(diffNum, gameTarget.PayTarget, gameTask.TaskName)
+					go s.FreeSendMsg(diffNum, gameTarget.PayTarget, gameTask.TaskName, gameTask.User)
 					// 如果当前付费目标完成，加入一下逻辑
 					if completeTaskData[gameTask.TaskId].PayTarget <= completeTaskData[gameTask.TaskId].PayComplete {
 						lastPayCompletedUpdateTimeKey := fmt.Sprintf(LastPayCompletedUpdateTimeKey, date, gameTask.TaskId)
@@ -798,7 +800,8 @@ func (s *SyncData) TaskMsgSend() {
 			global.GVA_LOG.Error("TaskMsgSend上次数据发送时间还没到5分钟", zap.Error(err))
 			return
 		}
-		s.TaskMsgSendRetainedData(ctx, completesInfo, ctime, date, lastMsgSendTimeKey)
+		//s.TaskMsgSendRetainedData(ctx, completesInfo, ctime, date, lastMsgSendTimeKey)
+		s.TaskMsgSendRetainedDataUpdate(ctx, completesInfo, ctime, date, lastMsgSendTimeKey)
 	}
 }
 
@@ -830,7 +833,8 @@ func (s *SyncData) TaskFreeMsgSend() {
 	if lastFreeMsgSendTime == 0 {
 		isOne = true
 	}
-	s.TaskMsgSendFreeData(ctx, completesInfo, ctime, date, lastFreeMsgSendTimeKey, isOne)
+	//s.TaskMsgSendFreeData(ctx, completesInfo, ctime, date, lastFreeMsgSendTimeKey, isOne)
+	s.TaskMsgSendFreeDataUpdate(ctx, completesInfo, ctime, date, lastFreeMsgSendTimeKey, isOne)
 }
 
 func (s *SyncData) CheckTaskCompletedInfo() {
@@ -1117,7 +1121,7 @@ func (s *SyncData) TaskMsgSendRetainedDataUpdate(ctx context.Context, completesI
 		}
 		for pName, pMsg := range sendMsg {
 			if hour >= mpsPerson[pName].StartTime {
-				var personMsg = "# 付费播报 "
+				var personMsg = "# 活跃播报 "
 				personMsg += fmt.Sprintf("<font color=\"warning\">%s</font>", time.Now().Format("2006-01-02 15:04:05"))
 				personMsg = pMsg
 				if _, ok := errSendMsg[pName]; ok {
@@ -1127,6 +1131,7 @@ func (s *SyncData) TaskMsgSendRetainedDataUpdate(ctx context.Context, completesI
 				var sendPersonData SendMsg
 				sendPersonData.MsgType = "markdown"
 				sendPersonData.Markdown.Content = personMsg
+				global.GVA_LOG.Warn(personMsg)
 				s.SendMsgData(url, sendPersonData)
 				if mpsPerson[pName].Custodians != "" {
 					custodiansMsg := fmt.Sprintf("<font color=\"warning\">%s的任务</font>", pName)