Merge branch 'cygx_8.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -357,7 +357,7 @@ func (this *ReportController) ArticleCategoryList() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	list, err := models.IndustrialToArticleCategory(industrialManagementId, detail.ChartPermissionId)
+	list, err := models.IndustrialToArticleCategoryNew(industrialManagementId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
@@ -1211,11 +1211,17 @@ func (this *ReportController) IsShow() {
 		return
 	}
 	var resp models.IsShow
-
+	IsShowFreeButton, err := services.GetfreeButtonIsShow(user)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetfreeButtonIsShow Err:" + err.Error()
+		return
+	}
 	resp.IsShowChart = true
 	resp.IsShowResearch = true
 	resp.LinkWxExplain = utils.LINK_WX_EXPLAIN
 	resp.YanXuan_Explain = true
+	resp.IsShowFreeButton = IsShowFreeButton
 	mobile := user.Mobile
 	if mobile == "" {
 		br.Ret = 200

models/article.go

@@ -263,8 +263,9 @@ func GetArticleAll() (item []*ArticleDetail, err error) {
 }
 func GetArticleAllDate(endDate string) (item []*ArticleDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ?  `
-	_, err = o.Raw(sql, endDate).QueryRows(&item)
+	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ? AND  article_id = 7297  `
+	sql = `SELECT * FROM cygx_article WHERE article_id = ?  `
+	_, err = o.Raw(sql, 7297).QueryRows(&item)
 	return
 }
 

models/report.go

@@ -109,6 +109,24 @@ func IndustrialToArticleCategory(industrialManagementId, chartPermissionId int)
 	return
 }
 
+//产业下所关联的文章分类列表 2022-10-13
+func IndustrialToArticleCategoryNew(industrialManagementId int) (items []*IndustrialToArticleCategoryRep, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT map.match_type_name,map.category_id
+    FROM cygx_report_mapping AS map
+	INNER JOIN cygx_article AS art ON art.category_id = map.category_id
+	INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = art.article_id
+	WHERE map.report_type = 2
+	AND map.is_report = 1
+    AND art.is_report = 1
+    AND art.publish_status = 1
+	AND man_g.industrial_management_id =?
+	AND map.chart_permission_id = ?
+	GROUP BY map.match_type_name`
+	_, err = o.Raw(sql, industrialManagementId).QueryRows(&items)
+	return
+}
+
 //判断用户是否阅读该产业下，某一分类的文章
 func IndustrialUserRecordArticleCount(userId, industrialManagementId, categoryId int) (count int, err error) {
 	o := orm.NewOrm()
@@ -208,13 +226,14 @@ func GetWhichDepartmentCount(condition string) (count int, err error) {
 }
 
 type IsShow struct {
-	IsShow          bool      `description:"绝密内参按钮是否展示"`
-	IsShowResearch  bool      `description:"研选是否展示限免"`
-	IsShowChart     bool      `description:"图表是否展示限免"`
-	IsShowList      bool      `description:"榜单是否展示"`
-	LinkWxExplain   string    `description:"关注微信公众号链接说明地址"`
-	YanXuan_Explain bool      `description:"研选说明"`
-	SearchTxtList   SearchTxt `description:"搜索栏回显内容说明"`
+	IsShow           bool      `description:"绝密内参按钮是否展示"`
+	IsShowFreeButton bool      `description:"免费送月卡按钮是否展示"`
+	IsShowResearch   bool      `description:"研选是否展示限免"`
+	IsShowChart      bool      `description:"图表是否展示限免"`
+	IsShowList       bool      `description:"榜单是否展示"`
+	LinkWxExplain    string    `description:"关注微信公众号链接说明地址"`
+	YanXuan_Explain  bool      `description:"研选说明"`
+	SearchTxtList    SearchTxt `description:"搜索栏回显内容说明"`
 }
 
 type SearchTxt struct {

services/tactics.go

@@ -745,6 +745,7 @@ func GetSummarytoEs(cont context.Context) (err error) {
 		item.ArticleId = v.ArticleId
 		item.Title = v.Title
 		item.PublishDate = v.PublishDate
+		bodyText, _ = GetReportContentTextSub(v.Body)
 		item.BodyText = bodyText
 		item.CategoryId = strconv.Itoa(v.CategoryId)
 		item.ExpertBackground = v.ExpertBackground

services/user_freee_button.go

@@ -0,0 +1,28 @@
+package services
+
+import (
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+)
+
+// GetfreeButtonIsShow 用户免费分享按钮是否回显
+func GetfreeButtonIsShow(user *models.WxUserItem) (isShow bool, err error) {
+	detail, err := models.GetConfigByCode("free_trial_card")
+	if err != nil {
+		return
+	}
+	companyDetail, err := models.GetCompanyDetailByIdGroup(user.CompanyId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	count, err := models.CountCygxUserFreeeButton(user.UserId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	if companyDetail != nil && companyDetail.IsSuspend == 0 {
+		if detail.ConfigValue == "1" && (companyDetail.Status == "正式" || companyDetail.Status == "试用" || companyDetail.Status == "永续") && count == 0 {
+			isShow = true
+		}
+	}
+	return
+}