Merge branch 'cygx_10.9' into debug

controllers/activity.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"

services/activity_wx_template_msg.go

@@ -155,7 +155,7 @@ func SendActivitieSignTemplateMsg(user *models.WxUserItem, activityDetail *model
 func SendActivitieCancelSignTemplateMsg(user *models.WxUserItem, activityDetail *models.ActivityDetail) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg(fmt.Sprint("线下调研活动扫码签到给对应销售发模班消息推送失败Err:", err.Error(), "活动ID：", activityDetail.ActivityId, "手机号：", user.Mobile), 2)
+			go utils.SendAlarmMsg(fmt.Sprint("取消活动给销售和内容组四人发模版消息Err:", err.Error(), "活动ID：", activityDetail.ActivityId, "手机号：", user.Mobile), 2)
 		}
 	}()
 	//获取销售手机号
@@ -192,6 +192,6 @@ func SendActivitieCancelSignTemplateMsg(user *models.WxUserItem, activityDetail
 	sendInfo.Resource = user.Mobile
 	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
 	sendInfo.OpenIdArr = openIdArr
-	err = services.PublicSendTemplateMsg(sendInfo)
+	err = PublicSendTemplateMsg(sendInfo)
 	return
 }