fix

services/cygx/acitvity.go

@@ -854,7 +854,10 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 	if err != nil {
 		return
 	}
-
+	industrialList, err := cygx.GetIndustrialActivityGroupManagementList(activityId, 1)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
 	if activityInfo.VisibleRange == 1 {
 		return //只要是仅对本组可见的活动，发布时，模板消息统一不发送， p2_876
 	}
@@ -1300,10 +1303,15 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 		return
 	}
 
+	industrialName := ""
+	for _, v := range industrialList {
+		industrialName += v.IndustryName + ","
+	}
+	industrialName = strings.TrimRight(industrialName, ",")
 	// 发类目模版消息
 	if activityInfo.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 		actTime,_ := time.Parse(utils.FormatDateTime,activityInfo.ActivityTime)
-		first := activityChartPermissionName
+		first := industrialName
 		keyword1 := "发布了新活动"
 		keyword2 := activityInfo.ActivityName
 		keyword3 := actTime.Format(utils.FormatDateTimeMinute2)

services/wechat_send_category_template_msg.go

@@ -533,23 +533,45 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 			openIdArr[i] = v.OpenId
 		}
 		resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
-		keyword1 := wxUser.RealName
-		keyword2 := wxUser.CompanyName
-		keyword3 := sellerItem.RealName
-		keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
-		keyword5 := utils.TruncateActivityNameString("报名："+activityInfo.ActivityName)
-
-		sendInfo := new(SendWxCategoryTemplate)
-		sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityApply
-		sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
-		sendInfo.RedirectTarget = 4
-		sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
-		sendInfo.OpenIdArr = openIdArr
-		err = SendCategoryTemplateMsg(sendInfo)
-		if e != nil {
-			err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
-			return
+
+		if activityInfo.ActivityTypeId == 5 {
+			// 专家线下沙龙走另一个模板
+			keyword1 := wxUser.RealName
+			keyword2 := wxUser.CompanyName
+			keyword3 := sellerItem.RealName
+			keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
+			keyword5 := utils.TruncateActivityNameString("报名："+activityInfo.ActivityName)
+
+			sendInfo := new(SendWxCategoryTemplate)
+			sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
+			sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityApply
+			sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+			sendInfo.RedirectTarget = 4
+			sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
+			sendInfo.OpenIdArr = openIdArr
+			err = SendCategoryTemplateMsg(sendInfo)
+			if e != nil {
+				err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
+				return
+			}
+		} else {
+			keyword1 := "销售已为您报名"
+			keyword2 := "报名成功"
+			keyword3 := utils.TruncateActivityNameString(activityInfo.ActivityName)
+			keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
+
+			sendInfo := new(SendWxCategoryTemplate)
+			sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4}
+			sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+			sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+			sendInfo.RedirectTarget = 4
+			sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
+			sendInfo.OpenIdArr = openIdArr
+			err = SendCategoryTemplateMsg(sendInfo)
+			if e != nil {
+				err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
+				return
+			}
 		}
 	}
 	return