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

controllers/activity.go

@@ -1053,6 +1053,7 @@ func (this *ActivityCoAntroller) SignupCancel() {
 // @Title  用户搜索详情
 // @Description 获取用户搜索详情接口
 // @Param   IsShowJurisdiction   query   int  true       "是否仅展示有权限的，默认为0，1是，2否 "
+// @Param   IsHideResearch   query   int  true       "是否隐藏研选行业 "
 // @Success Ret=200 {object} models.ActivityUserSearchContentList
 // @router /getUserSearchContent [get]
 func (this *ActivityCoAntroller) GetUserSearchContent() {
@@ -1068,6 +1069,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 		br.Ret = 408
 		return
 	}
+	isHideResearch, _ := this.GetBool("IsHideResearch", false)
 	uid := user.UserId
 	detailSeearch := new(models.CygxActivityUserSearchContent)
 	detailSeearch.IsShowJurisdiction = 0
@@ -1144,7 +1146,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	}
 	var listChartPermissionidNew2 []*models.ActivityChartPermission
 	for _, v := range list2 {
-		if userType == 1 {
+		if userType == 1 || isHideResearch {
 			//if v.PermissionName != "研选" {
 			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
@@ -1156,7 +1158,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	resp.ListChartPermission2 = listChartPermissionidNew2
 	var listChartPermissionidNew []*models.ActivityChartPermission
 	for _, v := range listChartPermissionid {
-		if userType == 1 {
+		if userType == 1 || isHideResearch {
 			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew = append(listChartPermissionidNew, v)
 			}
@@ -2412,6 +2414,9 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
+		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+			item.IsResearch = true
+		}
 
 		item.IsExternalLabel = v.IsExternalLabel
 

controllers/banner.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
+	"hongze/hongze_cygx/utils"
+	"time"
 )
 
 // Banner
@@ -164,8 +166,27 @@ func (this *BannerController) YxSurvey() {
 		br.ErrMsg = "内容不能为空"
 		return
 	}
-	//_, err = models.AddCygxBannerYxSurvey(item)
-	err = services.AddCygxBannerYxSurvey(user, content)
+	item := new(models.CygxBannerYxSurvey)
+	item.UserId = user.UserId
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.Content = content
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	item.RealName = user.RealName
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	newId, err := models.AddCygxBannerYxSurvey(item)
+	//err = services.AddCygxBannerYxSurvey(user, content)
+	services.SendCygxBannerYxSurveyTemplateMsg(user, content, int(newId))
 	if err != nil {
 		br.Msg = "申请失败"
 		br.ErrMsg = "申请失败，Err:" + err.Error()
@@ -176,8 +197,8 @@ func (this *BannerController) YxSurvey() {
 	br.Msg = "记录成功"
 }
 
-// @Title 研选banner列表
-// @Description 研选banner列表接口
+// @Title 我要调研内容详情
+// @Description 我要调研内容详情接口
 // @Param   SuveryId   query   int  true       "ID"
 // @Success Ret=200 {object} cygx.CygxBannerListResp
 // @router /yxSurvey/detail [get]

models/activity.go

@@ -790,12 +790,14 @@ type CygxActivityLabelList struct {
 	City              string `description:"城市"`
 	Days              int    `description:"天数"`
 	ActivityTypeId    int    `description:"活动类型id"`
+	IsResearch        bool   `description:"是否属于研选"`
+	ChartPermissionId int    `description:"行业id"`
 }
 
 // 主题列表
 func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city,is_external_label,is_research_points
+	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city,is_external_label,is_research_points,chart_permission_id
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

services/banner_yx_survey.go

@@ -43,13 +43,13 @@ func AddCygxBannerYxSurvey(user *models.WxUserItem, content string) (err error)
 	return
 }
 
-// 用户约访专家的请求，向对应销售发送模版消息
-func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, articleId int) (err error) {
+// 用户提交研选调研需求，向对应销售发送模版消息
+func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string, articleId int) (err error) {
 	var msg string
 	msg = fmt.Sprint(user, articleId)
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("活动带问提醒发送模版消息失败"+msg, 2)
+			go utils.SendAlarmMsg("SendCygxBannerYxSurveyTemplateMsg Err"+msg, 2)
 		}
 	}()
 	//获取权益销售
@@ -60,12 +60,7 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, articleId int) (
 	if sellerItem == nil {
 		return
 	}
-	//文章详情
-	detailArticle, e := models.GetArticleDetailById(articleId)
-	if e != nil {
-		err = errors.New("GetArticleDetailById, Err: " + e.Error())
-		return
-	}
+
 	//销售对应的Openid
 	openIdList, e := models.GetWxOpenIdByMobileList(sellerItem.Mobile)
 	if e != nil {
@@ -89,9 +84,11 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, articleId int) (
 	}
 	keyword2 = user.Mobile
 	keyword3 = time.Now().Format(utils.FormatDateTime)
-	keyword4 = fmt.Sprint("约访专家(", detailArticle.Title, ")")
+	keyword4 = fmt.Sprint("研选调研需求：", content)
 	var redirectUrl string
-	redirectUrl = utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleId)
+	if utils.RunMode == "" {
+		redirectUrl = utils.WX_MSG_PATH_YX_SURVEY_DETAIL + strconv.Itoa(articleId)
+	}
 	sendInfo := new(SendWxTemplate)
 	sendInfo.Keyword1 = keyword1
 	sendInfo.Keyword2 = keyword2

utils/constants.go

@@ -180,6 +180,7 @@ const (
 	WX_MSG_PATH_RESEARCHTHEME_DETAIL     = "reportPages/researchTheme/researchTheme?id="                  //主题详情模板消息地址
 	WX_MSG_PATH_ACTIVITY_SIGN            = "pages-message/activityTemplate/activityTemplate?id="          //活动模板消息地址
 	WX_MSG_PATH_APPLY_DETAIL             = "pages-message/applyFor/applyFor?id="                          //潜在用户试用权限申请
+	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pageMy/reportDetail/reportDetail?id="                         //文章详情模板消息地址
 )
 
 //2：文章详情  https://web.hzinsights.com/material/info/8436  小程序路径：/pageMy/reportDetail/reportDetail?id=