Merge branch 'eta/1.8.3' into debug

controllers/report.go

@@ -1068,17 +1068,6 @@ func (this *ReportController) ThsSendTemplateMsg() {
 			br.ErrMsg = "模板消息已推送，请勿重复操作1"
 			return
 		}
-		// 周报无客群
-		if report.HasChapter == 1 && report.ChapterType == utils.REPORT_TYPE_WEEK {
-			br.Msg = "周报无需推送客群消息"
-			return
-		}
-		err = services.SendReportMiniToThs(report)
-		if err != nil {
-			br.Msg = "消息已推送，请勿重复操作"
-			br.ErrMsg = "模板消息已推送，请勿重复操作2, Err: " + err.Error()
-			return
-		}
 		err = models.ModifyReportThsMsgIsSend(report)
 		if err != nil {
 			br.Msg = "发送失败"
@@ -2159,17 +2148,6 @@ func (this *ReportController) SendMsg() {
 			_ = services.SendMiniProgramReportWxMsg(req.ReportId)
 		}()
 	}
-	// 推送客群消息
-	if report.ThsMsgIsSend == 0 {
-		go func() {
-			// 周报无客群消息
-			// 2023-3-19 15:19:24 现在开始周报又要推送了
-			//if report.HasChapter == 1 && report.ChapterType == utils.REPORT_TYPE_WEEK {
-			//	return
-			//}
-			_ = services.SendReportMiniToThs(report)
-		}()
-	}
 
 	// 更新推送消息状态
 	if err = models.ModifyReportMsgIsSendV2(req.ReportId); err != nil {

controllers/report_chapter.go

@@ -1283,18 +1283,21 @@ func (this *ReportController) PublishDayWeekReportChapter() {
 		return
 	}
 
-	// 获取规则配置
-	reportChapterTypeRule, err := models.GetReportChapterTypeById(chapterInfo.TypeId)
-	if err != nil {
-		br.Msg = "获取配置信息异常"
-		br.ErrMsg = "获取配置信息异常, Err: " + err.Error()
-		return
-	}
-	if reportChapterTypeRule.Enabled == 0 {
-		br.Msg = "该章节已永久停更"
-		br.ErrMsg = "该章节已永久停更 "
-		br.IsSendEmail = false
-		return
+	// 如果是系统章节，那么需要校验下是否已经停更
+	if chapterInfo.TypeId > 0 {
+		// 获取规则配置
+		reportChapterTypeRule, err := models.GetReportChapterTypeById(chapterInfo.TypeId)
+		if err != nil {
+			br.Msg = "获取配置信息异常"
+			br.ErrMsg = "获取配置信息异常, Err: " + err.Error()
+			return
+		}
+		if reportChapterTypeRule.Enabled == 0 {
+			br.Msg = "该章节已永久停更"
+			br.ErrMsg = "该章节已永久停更 "
+			br.IsSendEmail = false
+			return
+		}
 	}
 
 	var publishTime time.Time

services/report.go

@@ -80,22 +80,22 @@ func PublishDayWeekReport(reportId int) (tips string, err error) {
 		updateCols = append(updateCols, "Title", "State", "ModifyTime")
 
 		// 发布后标题调整
-		title := report.Title
-		title = strings.ReplaceAll(title, "【弘则FICC晨报】", "")
-		title = strings.ReplaceAll(title, "【弘则FICC周报】", "")
-		if title == "" {
-			// 取第一个需发布章节的标题
-			firstId := publishIdArr[0]
-			firstTitle := ""
-			for i := 0; i < chapterLen; i++ {
-				if chapters[i].ReportChapterId == firstId {
-					firstTitle = chapters[i].Title
-					break
-				}
-			}
-			title = firstTitle
-		}
-		report.Title = title
+		//title := report.Title
+		//title = strings.ReplaceAll(title, "【弘则FICC晨报】", "")
+		//title = strings.ReplaceAll(title, "【弘则FICC周报】", "")
+		//if title == "" {
+		//	// 取第一个需发布章节的标题
+		//	firstId := publishIdArr[0]
+		//	firstTitle := ""
+		//	for i := 0; i < chapterLen; i++ {
+		//		if chapters[i].ReportChapterId == firstId {
+		//			firstTitle = chapters[i].Title
+		//			break
+		//		}
+		//	}
+		//	title = firstTitle
+		//}
+		//report.Title = title
 		report.State = 2
 
 		// 研报后台4.4 只在没有发布过时更新发布时间，其余均按模版消息发送时间当作发布时间

services/report_push.go

@@ -1,25 +0,0 @@
-package services
-
-import (
-	"eta/eta_api/models"
-	"eta/eta_api/services/alarm_msg"
-	"strconv"
-)
-
-//func init() {
-//	report, _ := models.GetReportById(572)
-//	SendReportToThs(report)
-//}
-
-// SendReportMiniToThs 发送报告-研报小程序到同花顺
-func SendReportMiniToThs(report *models.ReportDetail) (err error) {
-	defer func() {
-		if err != nil {
-			go alarm_msg.SendAlarmMsg("SendReportMiniToThs 发送报告-研报小程序到同花顺失败, ReportId:"+strconv.Itoa(report.Id)+", ErrMsg:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "SendReportMiniToThs发送报告至同花顺失败, ReportId:" + strconv.Itoa(report.Id) + ", ErrMsg:" + err.Error(), utils.EmailSendToUsers)
-		}
-	}()
-	if report.HasChapter == 0 {
-	}
-	return
-}