Merge branch 'cygx/cygx_need_p2_864' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/cygx/activity.go

@@ -1594,7 +1594,7 @@ func (this *ActivityCoAntroller) ImgToText() {
 		if k == 0 && !strings.Contains(v.Word, "/") {
 			continue
 		}
-		if strings.Contains(v.Word, "/") {
+		if strings.Contains(v.Word, "/") && !strings.Contains(v.Word, "(") && !strings.Contains(v.Word, ")") {
 			mapTitmeYMD[lineNum] = v.Word
 			titmeYMD = v.Word
 		}
@@ -1602,6 +1602,9 @@ func (this *ActivityCoAntroller) ImgToText() {
 			mapTitmeHM[lineNum] = v.Word
 			titmeHM = v.Word
 		}
+		if strings.Contains(v.Word, "(") && !strings.Contains(v.Word, ")") {
+			v.Word += ")" // 图片识别的偶尔有问题，兼容一下
+		}
 		if strings.Contains(v.Word, "(") && strings.Contains(v.Word, ")") {
 			if mapTitmeYMD[lineNum] == "" {
 				mapTitmeYMD[lineNum] = mapTitmeYMD[lineNum-1]

services/cygx/activity_ocr.go

@@ -72,14 +72,15 @@ func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
 }
 
 // 活动内容模版
-var ActivityOcrTemplate = "<p>【买方研选-小范围公司线上交流】{{COMPANY}}</p><p>时间：{{TIME}}</p><p>嘉宾：IR</p><p>主持人：IR</p><p>链接参会：（会前一天下午更新）</p><p>备注：</p><p>1、请先报名，我们将于会议前一天提供【Webex】入会链接（可电话拨入or网络端参会）；</p><p>2、会议语言：{{LANGUAGE}}；</p><p>3、本场会议报名截止时间为会议开始前一天下午3点半；</p><p>4、本次会议扣0.5次研选服务点。</p>"
+var ActivityOcrTemplate = "<p>【小范围公司线上交流】{{COMPANY}}</p><p>时间：{{TIME}}</p><p>嘉宾：IR</p><p>主持人：IR</p><p>链接参会：（会前一天下午更新）</p><p>备注：</p><p>1、请先报名，我们将于会议前一天提供【Webex】入会链接（可电话拨入or网络端参会）；</p><p>2、会议语言：{{LANGUAGE}}；</p><p>3、本场会议报名截止时间为会议开始前一天下午3点半；</p><p>4、本次会议扣0.5次研选服务点。</p>"
 
 func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.ActivityRep, err error, errMsg string) {
 	for _, v := range list {
 		ActivityOcrTmp := ActivityOcrTemplate
 		sliceCompany := strings.Split(v.Company, "(")
 		company := sliceCompany[0]
-		ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{COMPANY}}", company, -1)
+		//company := v.Company
+		ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{COMPANY}}", v.Company, -1)
 		v.TitmeYMD = strings.Replace(v.TitmeYMD, "年", "-", -1)
 		v.TitmeYMD = strings.Replace(v.TitmeYMD, "月", "-", -1)
 		v.TitmeYMD = strings.Replace(v.TitmeYMD, "日", "", -1)
@@ -145,6 +146,7 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
 	req.VisibleRange = 2
 	req.IsResearchPoints = 1
 	req.IsNeedEmail = 1
+	req.IsShowHz = 1 //是否同时在弘则展示  1是，0否
 	// 研选点数
 	pointsSet := new(cygx.CygxActivityPointsSetRsq)
 	pointsSet.PointsObject = "1"

services/cygx/product_interior.go

@@ -230,7 +230,7 @@ func SendWxMsgWithCygxProductInterior(productInteriorId int) (err error) {
 		openIdArr[i] = v.OpenId
 	}
 	first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
-	keyword1 := "【宏观" + detail.ChartPermissionName + "】有报告发布/更新"
+	keyword1 := "【" + detail.ChartPermissionName + "】有报告发布/更新"
 	keyword2 := detail.Title
 	keyword3 := utils.TimeRemoveHms2(detail.PublishTime)
 	keyword4 := detail.Abstract