xingzai vor 1 Jahr
Ursprung
Commit
9bc54849ff
2 geänderte Dateien mit 4 neuen und 167 gelöschten Zeilen
  1. 3 4
      controllers/yanxuan_special.go
  2. 1 163
      services/cygx_yanxuan_special.go

+ 3 - 4
controllers/yanxuan_special.go

@@ -395,7 +395,6 @@ func (this *YanxuanSpecialController) Save() {
 		go services.UpdateYanxuanSpecialResourceData(int(newId)) //  写入首页最新  cygx_resource_data 表
 		go services.EsAddYanxuanSpecial(int(newId))              //  写入es 综合搜索
 	}
-	go services.SendWxMsgSpecialAuthor(req.Id, item.Status)
 	br.Ret = 200
 	br.Success = true
 	br.Data = newId
@@ -480,9 +479,9 @@ func (this *YanxuanSpecialController) Enable() {
 		br.ErrMsg = "审批失败, Err:" + tmpErr.Error()
 		return
 	}
-	if req.Status == 1 {
-		go services.SendWxMsgSpecialFollow(req.Id)
-	}
+	//if req.Status == 1 {
+	//	go services.SendWxMsgSpecialFollow(req.Id)
+	//}
 	go services.UpdateYanxuanSpecialResourceData(req.Id) //  写入首页最新  cygx_resource_data 表
 	go services.EsAddYanxuanSpecial(req.Id)              //  写入es 综合搜索
 	br.Msg = "审批成功"

+ 1 - 163
services/cygx_yanxuan_special.go

@@ -6,97 +6,9 @@ import (
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/utils"
 	"strconv"
-	"strings"
 	"time"
 )
 
-// 研选专栏有新内容审核通过时,给关注此专栏的客户发送模板消息
-func SendWxMsgSpecialFollow(specialId int) (err error) {
-	var msg string
-	defer func() {
-		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
-			go utils.SendAlarmMsg(fmt.Sprint("研选专栏有新内容审核通过时,给关注此专栏的客户发送模板消息失败", specialId, ", specialId"), 2)
-			utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
-		}
-	}()
-	var first string
-	var keyword1 string
-	var keyword2 string
-	var keyword3 string
-	var keyword4 string
-	var remark string
-
-	followers, e := models.GetYanxuanSpecialFollowUserById(specialId)
-	if e != nil {
-		err = errors.New("GetYanxuanSpecialFollowUserById, Err: " + e.Error())
-		return
-	}
-
-	specialItem, e := models.GetYanxuanSpecialItemById(specialId)
-	if e != nil {
-		err = errors.New("GetYanxuanSpecialFollowUserById, Err: " + e.Error())
-		return
-	}
-	var allInUserId string
-	for _, v := range followers {
-		allInUserId += strconv.Itoa(v) + ","
-	}
-
-	allInUserId = strings.TrimRight(allInUserId, ",")
-
-	userList, err := models.GetWxUserListByUserIds(allInUserId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
-	}
-
-	mobile := ``
-
-	for _, v := range userList {
-		mobile += v.Mobile + ","
-	}
-
-	mobile = strings.TrimRight(mobile, ",")
-
-	openIdList, e := models.GetWxOpenIdByMobileList(mobile)
-	if e != nil {
-		err = errors.New("GetSellerByAdminId, Err: " + e.Error())
-		return
-	}
-
-	//first =
-	keyword1 = "研选专栏:" + specialItem.SpecialName
-	keyword2 = "发布了新内容,点击查看详情"
-	keyword3 = "-"
-	//keyword4 = "【" + activityInfo.ResearchTheme + "】已有10人预报名"
-	openIdArr := make([]string, 0)
-	for _, v := range openIdList {
-		openIdArr = append(openIdArr, v.OpenId)
-	}
-	redirectUrl := ""
-	if utils.RunMode == "release" {
-		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
-	}
-	sendInfo := new(SendWxTemplate)
-	sendInfo.First = first
-	sendInfo.Keyword1 = keyword1
-	sendInfo.Keyword2 = keyword2
-	sendInfo.Keyword3 = keyword3
-	sendInfo.Keyword4 = keyword4
-	sendInfo.Remark = remark
-	sendInfo.TemplateId = utils.WxMsgTemplateIdAskMsgXzs
-	sendInfo.RedirectUrl = redirectUrl
-	sendInfo.RedirectTarget = 3
-	sendInfo.Resource = strconv.Itoa(specialId)
-	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
-	sendInfo.OpenIdArr = openIdArr
-	err = PublicSendTemplateMsg(sendInfo)
-	if err != nil {
-		return
-	}
-	return
-}
-
 // SendReviewTemplateMsgAdmin 提交审核时给王芳,汪洋发消息
 func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 	defer func() {
@@ -123,7 +35,7 @@ func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 		return
 	}
 	user, e := models.GetWxUserItemByUserId(specialItem.UserId)
-	if e != nil && e.Error() != utils.ErrNoRow() {
+	if e != nil {
 		err = errors.New("GetWxUserItemByUserId, Err: " + e.Error())
 		return err
 	}
@@ -163,80 +75,6 @@ func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 	return
 }
 
-// 研选专栏审核完成时,给提交人发送模板消息
-func SendWxMsgSpecialAuthor(specialId, status int) (err error) {
-	var msg string
-	defer func() {
-		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
-			go utils.SendAlarmMsg(fmt.Sprint("研选专栏审核完成时,给提交人发送模板消息", specialId, ", specialId"), 2)
-			utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
-		}
-	}()
-	var first string
-	var keyword1 string
-	var keyword2 string
-	var keyword3 string
-	var keyword4 string
-	var remark string
-	var redirectUrl string
-
-	specialItem, e := models.GetYanxuanSpecialItemById(specialId)
-	if e != nil {
-		err = errors.New("GetYanxuanSpecialFollowUserById, Err: " + e.Error())
-		return
-	}
-	user, e := models.GetWxUserItemByUserId(specialItem.UserId)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetWxUserItemByUserId, Err: " + e.Error())
-		return err
-	}
-
-	openIdList, err := models.GetUserRecordListByMobile(4, user.Mobile)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
-	}
-
-	//first =
-	keyword1 = "研选专栏内容审核"
-	if status == 1 {
-		keyword2 = "已通过审核,点击查看详情"
-		if utils.RunMode == "release" {
-			redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
-		}
-	} else {
-		keyword2 = "未通过审核,点击查看驳回原因"
-		if utils.RunMode == "release" {
-			redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_CENTER
-		}
-	}
-
-	keyword3 = "-"
-	//keyword4 = "【" + activityInfo.ResearchTheme + "】已有10人预报名"
-	openIdArr := make([]string, 0)
-	for _, v := range openIdList {
-		openIdArr = append(openIdArr, v.OpenId)
-	}
-	sendInfo := new(SendWxTemplate)
-	sendInfo.First = first
-	sendInfo.Keyword1 = keyword1
-	sendInfo.Keyword2 = keyword2
-	sendInfo.Keyword3 = keyword3
-	sendInfo.Keyword4 = keyword4
-	sendInfo.Remark = remark
-	sendInfo.TemplateId = utils.WxMsgTemplateIdAskMsgXzs
-	sendInfo.RedirectUrl = redirectUrl
-	sendInfo.RedirectTarget = 3
-	sendInfo.Resource = strconv.Itoa(specialId)
-	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
-	sendInfo.OpenIdArr = openIdArr
-	err = PublicSendTemplateMsg(sendInfo)
-	if err != nil {
-		return
-	}
-	return
-}
-
 // 更新研选专栏  写入首页最新  cygx_resource_data 表
 func UpdateYanxuanSpecialResourceData(sourceId int) {
 	var err error