Merge branch 'mfyx_wx_tmp_1.1' of http://8.136.199.33:3000/cxzhang/hongze_web_mfyx

controllers/activity.go

@@ -1243,6 +1243,11 @@ func (this *ActivityController) SignupAdd() {
 			if activityInfo.IsResearchPoints {
 				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
 			}
+			// 如果是买方研选下的专家沙龙，同时推给内容组四人
+			if activityInfo.ActivityTypeId == 5 {
+				go services.SendNeiRongZuActivitieSignTemplateMsg(user, activityInfo)
+				go services.SendNeiRongZuActivitieSignCategoryTemplateMsg(user, activityInfo)
+			}
 			go services.YanXuanActivityPointsBillSignupAdd(activityId, uid) // 用户报名添加到处理研选扣点
 		}
 

services/activity.go

@@ -1812,11 +1812,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		err = errors.New("GetUserRemind, Err: " + e.Error())
 		return
 	}
-	// 如果是买方研选下的专家沙龙，同时推给内容组四人
-	if activityDetail.ActivityTypeId == 5 {
-		go SendNeiRongZuActivitieSignTemplateMsg(user, activityDetail)
-		go SendNeiRongZuActivitieSignCategoryTemplateMsg(user, activityDetail)
-	}
+
 	//获取销售手机号
 	sellerItemQy, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
 	if e != nil && e.Error() != utils.ErrNoRow() {
@@ -1850,32 +1846,31 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		sourceMsg = "活动报名"
 	}
 
-	openIdListMfyx, e := models.GetMfyxWxOpenIdByMobileList(sellerItemQy.Mobile)
-	if e != nil {
-		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
-		return err
-	}
 	var keyword1 string
 	var keyword2 string
 	keyword1 = activityDetail.ActivityName
 	keyword2 = fmt.Sprint("互动：", sourceMsg, ",", user.RealName, "--", user.CompanyName)
 	//SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
+	openIdList, e := models.GetMfyxWxOpenIdByMobileList(sellerItemQy.Mobile)
+	if e != nil {
+		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
+		return err
+	}
+	//查研观向小助手推送
+	SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
 
 	// 类目模版买方研选
+	openIdListMfyx, e := models.GetMfyxWxOpenIdByMobileList(sellerItemQy.Mobile)
+	if e != nil {
+		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
+		return err
+	}
 	keyword1 = utils.TruncateActivityNameString(user.RealName + "-" + user.CompanyName)
 	keyword2 = fmt.Sprint("互动提醒：", sourceMsg)
 	keyword3 := utils.TruncateActivityNameString(activityDetail.ActivityName)
 	keyword4 := time.Now().Format(utils.FormatDateTimeMinute2)
 	redirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityDetail.ActivityId)
 	SendWxCategoryMsgWithActivityUserRemind(keyword1, keyword2, keyword3, keyword4, redirectUrl, openIdListMfyx, activityDetail.ActivityId)
-
-	openIdList, e := models.GetMfyxWxOpenIdByMobileList(sellerItemQy.Mobile)
-	if e != nil {
-		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
-		return err
-	}
-	//查研观向小助手推送
-	SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
 	return
 }