Merge remote-tracking branch 'origin/debug' into debug

controllers/company.go

@@ -4821,6 +4821,11 @@ func (this *CompanyController) Receive() {
 			go company.AddCompanyProductTryOutUpdateLog(companyProductTryOutUpdateLog, companyReportPermissionList)
 		}
 
+		//流失转试用,企业下面的用户自动添加产业关注
+		{
+			go cygxService.AddUserFllowCompanyLossToTryOut(req.CompanyId)
+		}
+
 	} else {
 		//跨部门领取
 		var startDateTime, endDateTime time.Time
@@ -9290,7 +9295,7 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		} else {
 			if v.DoType == 1 && v.Way != 4 && v.Way != 3 {
 				item.Content = item.ActivityName + "--报名"
-			} else if v.DoType == 2 && v.Way != 4 && v.Way != 3  {
+			} else if v.DoType == 2 && v.Way != 4 && v.Way != 3 {
 				item.Content = item.ActivityName + "--取消报名"
 			} else if v.Way == 4 {
 				item.Content = item.ActivityName + "--活动取消"

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]

controllers/cygx/report_selection.go

@@ -200,7 +200,7 @@ func (this *ReportSelectionController) PreserveAndPublish() {
 	//	}
 	//	existMap[v.ChartPermissionId] = v.ChartPermissionId 0
 	//}
-
+	go cygxService.UpdateReportSelectionResourceData(req.ArticleId) //首页最新页面数据逻辑处理 V11.1.1
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -551,6 +551,7 @@ func (this *ReportSelectionController) PublishAndCancel() {
 		br.ErrMsg = "操作失败,Err:" + err.Error()
 		return
 	}
+	go cygxService.UpdateReportSelectionResourceData(articleId) //首页最新页面数据逻辑处理 V11.1.1
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -931,7 +932,7 @@ func (this *ReportSelectionController) VisibleRange() {
 		br.ErrMsg = "操作失败,Err:" + err.Error()
 		return
 	}
-	cygxService.UpdateReportSelectionResourceData(articleId) //首页最新页面数据逻辑处理 V11.1.1
+	go cygxService.UpdateReportSelectionResourceData(articleId) //首页最新页面数据逻辑处理 V11.1.1
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/statistic_report.go

@@ -3432,13 +3432,13 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		}
 	}
 	//是否确认续约 CRM 13.9
-	conditionAscribRaiTotal += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
+	conditionAscribRaiTotal += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR  a.create_time <  '2023-01-01'  )   ` // 已确认
 	parsAscribeRaiTotal = append(parsAscribeRaiTotal, noRenewedcompanyIds)
 	if isConfirm != -1 {
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2  AND  a.create_time >=  '2023-01-01' )  ` // 待确认
 		} else {
-			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR   a.create_time <  '2023-01-01' )    ` // 已确认
 		}
 		parsAscribeRai = append(parsAscribeRai, noRenewedcompanyIds)
 	}

models/cygx/cygx_user.go

@@ -139,6 +139,46 @@ func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition,
 	return
 }
 
+type CygxCompanyUserAndSellerResp struct {
+	UserId      int    `description:"用户ID"`
+	Mobile      string `description:"手机号"`
+	Email       string `description:"邮箱"`
+	CompanyId   int    `description:"公司id"`
+	CompanyName string `description:"公司名称"`
+	RealName    string `description:"姓名"`
+	SellerName  string `description:"销售名称"`
+}
+
+// 给所有已绑定手机号的客户（除流失）列表
+func GetCygxCompanyUserListByNoLoss() (items []*CygxCompanyUserAndSellerResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			u.user_id,
+			u.mobile,
+			u.email,
+			u.real_name,
+			c.company_name,
+			c.company_id,
+			m.real_name AS seller_name 
+		FROM
+			wx_user AS u
+			INNER JOIN company AS c ON c.company_id = u.company_id
+			INNER JOIN company_product AS cp ON cp.company_id = c.company_id
+			INNER JOIN admin AS m ON m.admin_id = cp.seller_id
+			INNER JOIN user_seller_relation AS sr ON sr.user_id = u.user_id 
+		WHERE
+			1 = 1 
+			AND c.enabled = 1 
+			AND cp.STATUS != '流失' 
+			AND cp.product_id = 2 
+			AND sr.product_id = 2 
+		GROUP BY
+			u.user_id `
+
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // 对于上面的SQL的拆分优化查询速度
 func GetCygxCompanyUserListSplit(userIds string) (items []*CygxCompanyUser, err error) {
 	o := orm.NewOrm()

models/cygx/cygx_user_company.go

@@ -72,7 +72,7 @@ func GetCygxArticleHistoryRecordByCompany(condition string, startSize, pageSize
 		FROM
 			cygx_article_history_record_all AS r
 			INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two
 			LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id
 		WHERE

models/cygx/industry_fllow.go

@@ -21,7 +21,23 @@ type CygxIndustryFllow struct {
 	Source                 int       `description:"来源1查研观向，2查研观向小助手,3勾选全部赛道的用户进行自动关注"`
 }
 
-//关注产业列表
+// 列表
+func GetCygxIndustryFllowList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxIndustryFllow, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_industry_fllow WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	if startSize+pageSize > 0 {
+		sql += ` LIMIT ?,?  `
+		_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	} else {
+		_, err = o.Raw(sql, pars).QueryRows(&items)
+	}
+	return
+}
+
+// 关注产业列表
 func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -40,7 +56,7 @@ func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInte
 	return
 }
 
-//关注产业数量
+// 关注产业数量
 func GetCygxIndustryFllowCount(uid int) (count int, err error) {
 	o := orm.NewOrm()
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1  `
@@ -48,7 +64,7 @@ func GetCygxIndustryFllowCount(uid int) (count int, err error) {
 	return
 }
 
-//判断用户是否关注这些产业ID
+// 判断用户是否关注这些产业ID
 func GetCygxIndustryFllowCountByUser(uid int, industrialManagementd string) (count int, err error) {
 	o := orm.NewOrm()
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1 AND  industrial_management_id IN (` + industrialManagementd + `)`
@@ -56,7 +72,7 @@ func GetCygxIndustryFllowCountByUser(uid int, industrialManagementd string) (cou
 	return
 }
 
-//GetUserFllowIndustrialListByUserIdAndIndustrial 通过用户ID 跟产业ID获取用户关注的产业列表
+// GetUserFllowIndustrialListByUserIdAndIndustrial 通过用户ID 跟产业ID获取用户关注的产业列表
 func GetUserFllowIndustrialListByUserIdAndIndustrial(userIds, industrials string) (items []*CygxIndustryFllow, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_industry_fllow 
@@ -67,7 +83,7 @@ func GetUserFllowIndustrialListByUserIdAndIndustrial(userIds, industrials string
 	return
 }
 
-//批量添加
+// 批量添加
 func AddCygxIndustryFllowMulti(items []*CygxIndustryFllow) (err error) {
 	o := orm.NewOrm()
 	if len(items) > 0 {

models/cygx/resource_data.go

@@ -52,7 +52,7 @@ func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
 func UpdateResourceDataByItem(item *CygxResourceData) (err error) {
 	o := orm.NewOrm()
 	updateParams := make(map[string]interface{})
-	//updateParams["PublishDate"] = item.PublishDate
+	updateParams["PublishDate"] = item.PublishDate
 	updateParams["SearchTag"] = item.SearchTag
 	ptrStructOrTableName := "cygx_resource_data"
 	whereParam := map[string]interface{}{"source_id": item.SourceId, "source": item.Source}

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/admin_power.go

@@ -65,7 +65,7 @@ func GetAdminLookUserCompanyIds(sysUser *system.Admin) (companyIds []int, err er
 		for _, v := range companyProductList {
 			companyIds = append(companyIds, v.CompanyId)
 		}
-		companyIds = append(companyIds, 1) //添加潜在客户
+		companyIds = append(companyIds, 0) //添加潜在客户
 	}
 
 	return

services/cygx/industrial_management.go

@@ -3,7 +3,6 @@ package cygx
 import (
 	"errors"
 	"fmt"
-	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
@@ -68,27 +67,30 @@ func AddUserIndustryFllowByNewId(industrialManagementId int) (err error) {
 		}
 	}()
 	//获取小助手提交过勾选项的用户
-	var condition string
-	condition = " AND  is_refuse = 0 "
-	chooseSendtList, e := cygx.GetCygxXzsChooseSend(condition)
-	if e != nil {
-		err = errors.New("GetCygxXzsChooseSend , Err: " + e.Error())
-		return
-	}
-	var mobiles []string
-	for _, v := range chooseSendtList {
-		if v.Mobile != "" {
-			mobiles = append(mobiles, v.Mobile)
-		}
-	}
+	//var condition string
+	//condition = " AND  is_refuse = 0 "
+	//chooseSendtList, e := cygx.GetCygxXzsChooseSend(condition)
+	//if e != nil {
+	//	err = errors.New("GetCygxXzsChooseSend , Err: " + e.Error())
+	//	return
+	//}
+	//var mobiles []string
+	//for _, v := range chooseSendtList {
+	//	if v.Mobile != "" {
+	//		mobiles = append(mobiles, v.Mobile)
+	//	}
+	//}
 
-	userList, e := models.GetWxUserListByUserMobileHaveCompany(mobiles)
+	//userList, e := models.GetWxUserListByUserMobileHaveCompany(mobiles)
+	userList, e := cygx.GetCygxCompanyUserListByNoLoss() //需求池859 2023-08-29 目前数量大概在 16000条
 	if e != nil {
 		err = errors.New("GetWxUserListByUserMobileHaveCompany" + e.Error())
 		return
 	}
+	var numk int
 	var industryFllowItems []*cygx.CygxIndustryFllow
 	for _, vUser := range userList {
+		numk++
 		item := new(cygx.CygxIndustryFllow)
 		item.IndustrialManagementId = industrialManagementId
 		item.UserId = vUser.UserId
@@ -102,16 +104,28 @@ func AddUserIndustryFllowByNewId(industrialManagementId int) (err error) {
 		item.CreateTime = time.Now()
 		item.ModifyTime = time.Now()
 		industryFllowItems = append(industryFllowItems, item)
+		//一次插入五千条
+		if numk%5000 == 0 {
+			e = cygx.AddCygxIndustryFllowMulti(industryFllowItems)
+			if e != nil {
+				err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
+				return
+			}
+			industryFllowItems = make([]*cygx.CygxIndustryFllow, 0)
+			numk = 0
+		}
 	}
-	e = cygx.AddCygxIndustryFllowMulti(industryFllowItems)
-	if e != nil {
-		err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
-		return
+	if len(industryFllowItems) > 0 {
+		e = cygx.AddCygxIndustryFllowMulti(industryFllowItems)
+		if e != nil {
+			err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
+			return
+		}
 	}
 
-	//更新用户关注产业的标签
-	for _, v := range industryFllowItems {
-		IndustryFllowUserLabelLogAdd(v.IndustrialManagementId, 0, v.UserId)
-	}
+	////更新用户关注产业的标签
+	//for _, v := range industryFllowItems {
+	//	IndustryFllowUserLabelLogAdd(v.IndustrialManagementId, 0, v.UserId)
+	//}
 	return
 }

services/cygx/industry_fllow.go

@@ -0,0 +1,122 @@
+package cygx
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"strconv"
+	"time"
+)
+
+//func init() {
+//	AddUserFllowCompanyLossToTryOut(1431)
+//}
+
+// 流失客户转试用给下面的用户自动添加产业关注
+func AddUserFllowCompanyLossToTryOut(companyId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("流失客户转试用给下面的用户自动添加产业关注。失败 ErrMsg:"+err.Error()+"companyId ："+strconv.Itoa(companyId), 2)
+		}
+	}()
+
+	//获取机构下所有的用户
+	userList, e := models.GetWxUserListCompanyId(companyId)
+	if e != nil {
+		err = errors.New("GetWxUserListByUserMobileHaveCompany" + e.Error())
+		return
+	}
+	var condition string
+	var pars []interface{}
+	//所有的产业
+	industrNamelist, e := cygx.GetTopOneMonthArtReadNumIndustryAll(condition, pars)
+	if e != nil {
+		err = errors.New("GetTopOneMonthArtReadNumIndustryAll, Err: " + e.Error())
+		return
+	}
+	condition = " AND company_id =  ? "
+	pars = append(pars, companyId)
+	userFllowList, e := cygx.GetCygxIndustryFllowList(condition, pars, 0, 0)
+	if e != nil {
+		err = errors.New("GetCygxIndustryFllowList, Err: " + e.Error())
+		return
+	}
+	mapUserFllow := make(map[string]bool) // 用户已经关注了某些产业
+
+	for _, v := range userFllowList {
+		mapUserFllow[fmt.Sprint("Uid_", v.UserId, "IndustrialManagementId_", v.IndustrialManagementId)] = true //用户ID与产业ID组成唯一索引Map
+	}
+
+	var numk int
+	var industryFllowItems []*cygx.CygxIndustryFllow
+	var Items []*cygx.CygxIndustryFllow
+
+	for _, vUser := range userList {
+		for _, vIndustry := range industrNamelist {
+			if mapUserFllow[fmt.Sprint("Uid_", vUser.UserId, "IndustrialManagementId_", vIndustry.IndustrialManagementId)] {
+				continue
+			}
+			item := new(cygx.CygxIndustryFllow)
+			item.IndustrialManagementId = vIndustry.IndustrialManagementId
+			item.UserId = vUser.UserId
+			item.Email = vUser.Email
+			item.Mobile = vUser.Mobile
+			item.RealName = vUser.RealName
+			item.CompanyId = vUser.CompanyId
+			item.CompanyName = vUser.CompanyName
+			item.Source = 3 // 通过程序或者管理员手动添加的关注
+			item.Type = 1
+			item.CreateTime = time.Now()
+			item.ModifyTime = time.Now()
+			Items = append(Items, item)
+		}
+	}
+
+	//如果小于五千条就直接插入，大于五千条就批量插入
+	if len(Items) < 5000 {
+		e = cygx.AddCygxIndustryFllowMulti(Items)
+		if e != nil {
+			err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
+			return
+		}
+	} else {
+		for _, vUser := range Items {
+			numk++
+			item := new(cygx.CygxIndustryFllow)
+			item.IndustrialManagementId = vUser.IndustrialManagementId
+			item.UserId = vUser.UserId
+			item.Email = vUser.Email
+			item.Mobile = vUser.Mobile
+			item.RealName = vUser.RealName
+			item.CompanyId = vUser.CompanyId
+			item.CompanyName = vUser.CompanyName
+			item.Source = 3 // 通过程序或者管理员手动添加的关注
+			item.Type = 1
+			item.CreateTime = time.Now()
+			item.ModifyTime = time.Now()
+			industryFllowItems = append(industryFllowItems, item)
+			//一次插入五千条
+			if numk%5000 == 0 {
+				e = cygx.AddCygxIndustryFllowMulti(industryFllowItems)
+				if e != nil {
+					err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
+					return
+				}
+				industryFllowItems = make([]*cygx.CygxIndustryFllow, 0)
+				numk = 0
+			}
+		}
+		if len(industryFllowItems) > 0 {
+			e = cygx.AddCygxIndustryFllowMulti(industryFllowItems)
+			if e != nil {
+				err = errors.New("AddCygxIndustryFllowMulti , Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
+}

services/cygx/product_interior.go

@@ -171,32 +171,35 @@ func SendWxMsgWithCygxProductInterior(productInteriorId int) (err error) {
 		err = errors.New("获取所有有权的用户的 openid失败" + e.Error())
 		return
 	}
-	//var industrialName string
+	var industrialName string
+
+	industrialList, e := cygx.GetProductInteriorIndustrialGroupManagementList(productInteriorId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetProductInteriorIndustrialGroupManagementList，Err:" + e.Error())
+		return
+	}
+
+	//关联的产业推送产业，没有关联产业的推送行业 p2_867 2023-8-30
+	if len(industrialList) == 0 {
+		industrialName = detail.ChartPermissionName
+	} else {
+		//mapOpenidFllow := make(map[int]string)
+		//
+		for _, vindustr := range industrialList {
+			//获取关注对应产业的用户信息
+			//industryFllowList, e := cygx.GetCygxUserindustryFllowOpenid(vindustr.IndustrialManagementId)
+			//if e != nil {
+			//	err = errors.New("获取关注对应产业的用户信息失败 " + e.Error())
+			//	return
+			//}
+			//for _, v := range industryFllowList {
+			//	mapOpenidFllow[v.UserId] = v.OpenId
+			//}
+			industrialName += vindustr.IndustryName + ";"
+		}
+		industrialName = strings.TrimRight(industrialName, ";")
+	}
 
-	//industrialList, e := cygx.GetProductInteriorIndustrialGroupManagementList(productInteriorId)
-	//if e != nil && e.Error() != utils.ErrNoRow() {
-	//	err = errors.New("GetProductInteriorIndustrialGroupManagementList，Err:" + e.Error())
-	//	return
-	//}
-	//
-	//if len(industrialList) == 0 {
-	//	return
-	//}
-	//mapOpenidFllow := make(map[int]string)
-	//
-	//for _, vindustr := range industrialList {
-	//	//获取关注对应产业的用户信息
-	//	industryFllowList, e := cygx.GetCygxUserindustryFllowOpenid(vindustr.IndustrialManagementId)
-	//	if e != nil {
-	//		err = errors.New("获取关注对应产业的用户信息失败 " + e.Error())
-	//		return
-	//	}
-	//	for _, v := range industryFllowList {
-	//		mapOpenidFllow[v.UserId] = v.OpenId
-	//	}
-	//	industrialName += vindustr.IndustryName + ";"
-	//}
-	//industrialName = strings.TrimRight(industrialName, ";")
 	////获取拒绝接收推送的的用户的 openid
 	//mapOpenidRefuset := make(map[int]string)
 	//openidRefusetList, e := cygx.GetCygxUserRefusetOpenid()
@@ -209,14 +212,14 @@ func SendWxMsgWithCygxProductInterior(productInteriorId int) (err error) {
 	//}
 
 	//获取提交过推送规则的用户的 openid
-	mapUserIdChooseSend := make(map[int]int)
-	chooseSendtList, err := cygx.GetCygxXzsChooseSend("")
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
-	}
-	for _, v := range chooseSendtList {
-		mapUserIdChooseSend[v.UserId] = v.UserId
-	}
+	//mapUserIdChooseSend := make(map[int]int)
+	//chooseSendtList, err := cygx.GetCygxXzsChooseSend("")
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	return err
+	//}
+	//for _, v := range chooseSendtList {
+	//	mapUserIdChooseSend[v.UserId] = v.UserId
+	//}
 	openIdArr := make([]string, len(openidPowerList))
 	for i, v := range openidPowerList {
 		//if _, ok := mapOpenidRefuset[v.UserId]; ok {
@@ -229,8 +232,9 @@ func SendWxMsgWithCygxProductInterior(productInteriorId int) (err error) {
 		//}
 		openIdArr[i] = v.OpenId
 	}
+
 	first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
-	keyword1 := "【宏观" + detail.ChartPermissionName + "】有报告发布/更新"
+	keyword1 := "【" + industrialName + "】有报告发布/更新"
 	keyword2 := detail.Title
 	keyword3 := utils.TimeRemoveHms2(detail.PublishTime)
 	keyword4 := detail.Abstract