Merge branch 'yx_1.1' into debug

controllers/yanxuan_special.go

@@ -209,7 +209,7 @@ func (this *BaseAuthMobileController) Detail() {
 
 	//如果状态未审核通过，而且查看的不是本人，不是审核人员，就无法查看详情
 	var configCode string
-	configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
+	configCode = utils.TPL_MSG_YAN_XUAN_SPECIAL_APPROVAL
 	cnf, err := models.GetConfigByCode(configCode)
 	if err != nil {
 		br.Msg = "获取失败"

services/config.go

@@ -92,7 +92,7 @@ func CheckYxSpecialIsApprovalPersonnel(mobile string) (isApprovalPersonnel bool)
 	}()
 	var configCode string
 	//获取配置项里面审核人员的手机号
-	configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
+	configCode = utils.TPL_MSG_YAN_XUAN_SPECIAL_APPROVAL
 	cnf, e := models.GetConfigByCode(configCode)
 	if e != nil {
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)

services/cygx_yanxuan_special.go

@@ -97,7 +97,7 @@ func SendWxMsgSpecialFollow(specialId int) (err error) {
 	return
 }
 
-// SendReviewTemplateMsgAdmin 提交审核时给王芳，汪洋发消息
+// SendReviewTemplateMsgAdmin 提交审核时给王芳，葛琳发消息
 func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 	defer func() {
 		if err != nil {
@@ -105,8 +105,8 @@ func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 		}
 	}()
 	var configCode string
-	//如果是研选的就推送给汪洋跟王芳，否则就推送给王芳
-	configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
+	//研选专栏修改之后给这些手机号推送审核模版消息
+	configCode = utils.TPL_MSG_YAN_XUAN_SPECIAL_APPROVAL
 	cnf, e := models.GetConfigByCode(configCode)
 	if e != nil {
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)

utils/config.go

@@ -156,7 +156,7 @@ func init() {
 	SummaryArticleId = 1000000         //手动添加的纪要库开始ID
 	YanxSummaryPermissionId = 1001     //研选纪要分类ID
 	YanxViewpointPermissionId = 1002   //研选观点分类ID
-	WxMsgTemplateIdAskMsgMobileAll = "15557270714,18767183922,18621268829,18955528215,17758061174"
+	WxMsgTemplateIdAskMsgMobileAll = "15557270714,18767183922,18621268829,17758061174"
 	WxMsgTemplateIdAskMsgMobilePublic = "15557270714,18767183922,18621268829,17758061174" // 沈涛：18767183922、 王芳：18621268829
 	HtgjDefaultSaleName = "王芳"
 	HtgjSalt = "HTGJ&HZ"
@@ -192,7 +192,7 @@ func init() {
 		WxMsgCategoryTemplateIdArticleUserRemind = "4fwzgJ-YQndzH5OJWLkd0grvftgqhvP285t_oXUboi7DaaIhMI"
 		WxMsgTemplateIdAskMsgMobile = ""
 		//ActSendMsgMobile = "15618524605"
-		ActSendMsgMobile = "18955528215" // 汪洋手机号
+		ActSendMsgMobile = "15557270714" // 汪洋手机号
 		ArticleTaskClassMobile = "15557270714,18767183922,15216736473,15000123056,18701809782,17706316791,18652179672,17758061174"
 
 		ShangHaiCrmApiLink = "https://crm.hzinsights.com/"

utils/constants.go

@@ -237,11 +237,12 @@ const (
 )
 
 const (
-	TPL_MSG_WANG_YANG                  = "tpl_msg_wang_yang"           //汪洋手机号地址参数
-	TPL_MSG_WANG_FANG_WANG_YANG        = "tpl_msg_wang_fang_wang_yang" //权限模板消息接收人,王芳，汪洋
-	TPL_MSG                            = "tpl_msg"                     //王芳手机号地址参数
-	TPL_MSG_NEI_RONG_ZU                = "tpl_msg_nei_rong_zu"         //内容组四人
-	CYGX_TAG_HOT_ACTIVITY_ID    string = "cygx_tag_hot_activity_id"    //标签管理自定义的热门活动ID
+	TPL_MSG_WANG_YANG                        = "tpl_msg_wang_yang"                 //汪洋手机号地址参数
+	TPL_MSG_WANG_FANG_WANG_YANG              = "tpl_msg_wang_fang_wang_yang"       //权限模板消息接收人,王芳，汪洋
+	TPL_MSG_YAN_XUAN_SPECIAL_APPROVAL        = "tpl_msg_yan_xuan_special_approval" //研选专栏修改之后给这些手机号推送审核模版消息
+	TPL_MSG                                  = "tpl_msg"                           //王芳手机号地址参数
+	TPL_MSG_NEI_RONG_ZU                      = "tpl_msg_nei_rong_zu"               //内容组四人
+	CYGX_TAG_HOT_ACTIVITY_ID          string = "cygx_tag_hot_activity_id"          //标签管理自定义的热门活动ID
 )
 
 const (