feat:xiugai

pushentniche/push/job/nomsgtipjob.go

@@ -161,7 +161,7 @@ func (n *NoMsgTipJob) tip(taskType, hour int, user *UserInfo) {
 		logger.Info("无消息提醒任务", taskType, "mysql判断用户该时间段推送过，过滤掉", startUnix, endUnix, user.Entniche.UserId)
 		return
 	}
-	firstTitle, area, jcly, mailContent, infoCount, firstAutoId := n.SubRecommend(user)
+	firstTitle, area, jcly, mailContent, infoCount, firstAutoId, _, _ := n.SubRecommend(user)
 	if infoCount == 0 {
 		logger.Info("无消息提醒任务", taskType, "没有要推荐的信息，过滤掉", user.Entniche.UserId)
 		return
@@ -230,7 +230,7 @@ func (n *NoMsgTipJob) sendWeixin(user *UserInfo, ut3, firstTitle, area, jcly str
 }
 
 //
-func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64) {
+func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64, string, bool) {
 	n.selectPool <- true
 	defer func() {
 		<-n.selectPool

pushmember/push/job/nomsgtipjob.go

@@ -146,7 +146,7 @@ func (n *NoMsgTipJob) tip(taskType, hour int, user *UserInfo) {
 		logger.Info("无消息提醒任务", taskType, "mysql判断用户该时间段推送过，过滤掉", startUnix, endUnix, user.Id)
 		return
 	}
-	firstTitle, area, jcly, mailContent, infoCount, firstAutoId := n.SubRecommend(user)
+	firstTitle, area, jcly, mailContent, infoCount, firstAutoId, _, _ := n.SubRecommend(user)
 	if infoCount == 0 {
 		logger.Info("无消息提醒任务", taskType, "没有要推荐的信息，过滤掉", user.Id)
 		return
@@ -212,7 +212,7 @@ func (n *NoMsgTipJob) sendWeixin(user *UserInfo, firstTitle, area, jcly string,
 }
 
 //
-func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64) {
+func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64, string, bool) {
 	n.selectPool <- true
 	defer func() {
 		<-n.selectPool

pushsupersub/push/job/nomsgtipjob.go

@@ -144,7 +144,7 @@ func (n *NoMsgTipJob) tip(taskType, hour int, user *UserInfo) {
 		logger.Info("无消息提醒任务", taskType, "mysql判断超级订阅用户该时间段推送过，过滤掉", startUnix, endUnix, user.Id)
 		return
 	}
-	firstTitle, area, jcly, mailContent, infoCount, firstAutoId := n.SubRecommend(user)
+	firstTitle, area, jcly, mailContent, infoCount, firstAutoId, _, _ := n.SubRecommend(user)
 	if infoCount == 0 {
 		logger.Info("无消息提醒任务", taskType, "没有要推荐的信息，过滤掉", user.Id)
 		return
@@ -212,7 +212,7 @@ func (n *NoMsgTipJob) sendWeixin(user *UserInfo, firstTitle, area, jcly string,
 }
 
 //
-func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64) {
+func (n *NoMsgTipJob) SubRecommend(user *UserInfo) (string, string, string, string, int, int64, string, bool) {
 	n.selectPool <- true
 	defer func() {
 		<-n.selectPool