Merge branch 'cygx_10.9' into debug

# Conflicts:
#	services/activity.go

services/activity.go

@@ -2154,6 +2154,10 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		err = errors.New("GetUserRemind, Err: " + e.Error())
 		return
 	}
+	// 如果是买方研选下的专家沙龙，同时推给内容组四人
+	if activityDetail.ActivityTypeId == 5 {
+		go SendNeiRongZuActivitieSignTemplateMsg(user, activityDetail)
+	}
 	//获取销售手机号
 	sellerItemQy, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
 	if e != nil && e.Error() != utils.ErrNoRow() {
@@ -2195,40 +2199,6 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 	keyword1 = activityDetail.ActivityName
 	keyword2 = fmt.Sprint("互动：", sourceMsg, ",", user.RealName, "--", user.CompanyName)
 	SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
-	// 如果是买方研选下的专家沙龙，同时推给内容组四人
-	if activityDetail.ActivityTypeId == 5 {
-		configCode := utils.TPL_MSG_NEI_RONG_ZU
-		cnf, e := models.GetConfigByCode(configCode)
-		if e != nil {
-			err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
-			return
-		}
-		openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
-			return err
-		}
-		keyword1 := user.RealName + "--" + user.CompanyName + "（" + sellerItemQy.RealName +"）"
-		keyword2 := user.Mobile
-		keyword3 := time.Now().Format(utils.FormatDateTime)
-		keyword4 := "报名" + "【" +activityDetail.ActivityName+"】"
-		openIdArr := make([]string, 0)
-		for _, v := range openIdList {
-			openIdArr = append(openIdArr, v.OpenId)
-		}
-		sendInfo := new(SendWxTemplate)
-		sendInfo.Keyword1 = keyword1
-		sendInfo.Keyword2 = keyword2
-		sendInfo.Keyword3 = keyword3
-		sendInfo.Keyword4 = keyword4
-		sendInfo.TemplateId = utils.WxMsgTemplateIdApplyXzs
-		sendInfo.RedirectTarget = 3
-		sendInfo.Resource = user.Mobile
-		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
-		sendInfo.OpenIdArr = openIdArr
-		err = PublicSendTemplateMsg(sendInfo)
-		return
-	}
 	return
 }
 

services/activity_wx_template_msg.go

@@ -195,3 +195,48 @@ func SendActivitieCancelSignTemplateMsg(user *models.WxUserItem, activityDetail
 	err = PublicSendTemplateMsg(sendInfo)
 	return
 }
+
+// SendNeiRongZuActivitieSignTemplateMsg 报名活动给销售和内容组四人发模版消息
+func SendNeiRongZuActivitieSignTemplateMsg(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)
+		}
+	}()
+	//获取销售手机号
+	sellerItemQy, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	configCode := utils.TPL_MSG_NEI_RONG_ZU
+	cnf, e := models.GetConfigByCode(configCode)
+	if e != nil {
+		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
+		return
+	}
+	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
+		return
+	}
+	keyword1 := user.RealName + "--" + user.CompanyName + "（" + sellerItemQy.RealName +"）"
+	keyword2 := user.Mobile
+	keyword3 := time.Now().Format(utils.FormatDateTime)
+	keyword4 := "取消报名" + "【" +activityDetail.ActivityName+"】"
+	openIdArr := make([]string, 0)
+	for _, v := range openIdList {
+		openIdArr = append(openIdArr, v.OpenId)
+	}
+	sendInfo := new(SendWxTemplate)
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.Keyword3 = keyword3
+	sendInfo.Keyword4 = keyword4
+	sendInfo.TemplateId = utils.WxMsgTemplateIdApplyXzs
+	sendInfo.RedirectTarget = 3
+	sendInfo.Resource = user.Mobile
+	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
+	sendInfo.OpenIdArr = openIdArr
+	err = PublicSendTemplateMsg(sendInfo)
+	return
+}