Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into mfyx_2.0

services/cygx_yanxuan_special.go

@@ -84,7 +84,7 @@ func SendWxMsgSpecialFollow(specialId int) (err error) {
 	sendInfo.Keyword3 = keyword3
 	sendInfo.Keyword4 = keyword4
 	sendInfo.Remark = remark
-	sendInfo.TemplateId = utils.WxMsgTemplateIdAskMsgXzs
+	sendInfo.TemplateId = utils.WxMsgTemplateIdArticleUserRemind
 	sendInfo.RedirectUrl = redirectUrl
 	sendInfo.RedirectTarget = 3
 	sendInfo.Resource = strconv.Itoa(specialId)

services/user_admin_share.go

@@ -71,12 +71,12 @@ func AddCygxUserAdminShareHistory(user *models.WxUserItem, source, sourceTitle,
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
-			go utils.SendAlarmMsg(fmt.Sprint("记录分享来源失败 AddCygxUserAdminShareHistory, err：", err.Error()), 2)
+			go utils.SendAlarmMsg(fmt.Sprint("记录分享来源失败 AddCygxUserAdminShareHistory, err：", err.Error(), "inviteShareCode:", inviteShareCode), 2)
 		}
 	}()
 	adminDetail, e := models.GetUserAdminShareCodeByShareCode(inviteShareCode)
 	if e != nil {
-		err = errors.New("GetSysAdminByMobile, Err: " + e.Error())
+		err = errors.New("GetUserAdminShareCodeByShareCode, Err: " + e.Error())
 		return
 	}
 	if adminDetail == nil {

utils/config.go

@@ -179,7 +179,7 @@ func init() {
 		EmailExpert = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                    //研选行业专家邮箱
 		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                                 //白名单邮箱
 		WxMsgTemplateIdAskMsg = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
-		WxMsgTemplateIdArticleUserRemind = "7qe3i4MrGxAIPhJeMgoqqw6j0A_foUB65DLSmxKe05s"
+		WxMsgTemplateIdArticleUserRemind = "fxnlsjx-gm3dAZVJf6f3w27wA7anETl42kexXLP8FDs"
 		WxMsgTemplateIdAskMsgMobile = ""
 		//ActSendMsgMobile = "15618524605"
 		ActSendMsgMobile = "15557270714" // 汪洋手机号