|
@@ -846,6 +846,25 @@ func YiDongSignAppointmentsForThird(cont context.Context) (err error) {
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ if len(activityList) == 0 {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ listEmail, e := models.GetAskEmail()
|
|
|
|
+ if e != nil {
|
|
|
|
+ err = errors.New("GetAskEmail, Err: " + e.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //获取某一个活动下面不需要推送的主讲人手机号
|
|
|
|
+ idAndMobileNoSendMap := make(map[string]bool)
|
|
|
|
+ for _, v := range activityList {
|
|
|
|
+ for _, vName := range listEmail {
|
|
|
|
+ if strings.Contains(v.Speaker, vName.Name) {
|
|
|
|
+ idAndMobileNoSendMap[fmt.Sprint("Id_", v.ActivityId, "Mobile_", vName.Mobile)] = true
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
url := utils.YiDongHuaWeiYunUrl + "app/hz/signAppointmentsForThird"
|
|
url := utils.YiDongHuaWeiYunUrl + "app/hz/signAppointmentsForThird"
|
|
var outCallStatus string
|
|
var outCallStatus string
|
|
for _, v := range activityList {
|
|
for _, v := range activityList {
|
|
@@ -869,6 +888,9 @@ func YiDongSignAppointmentsForThird(cont context.Context) (err error) {
|
|
}
|
|
}
|
|
sellNameMap := GetSellNameMapByCompanyIds(companyIds)
|
|
sellNameMap := GetSellNameMapByCompanyIds(companyIds)
|
|
for _, vS := range listSignUp {
|
|
for _, vS := range listSignUp {
|
|
|
|
+ if idAndMobileNoSendMap[fmt.Sprint("Id_", vS.ActivityId, "Mobile_", vS.Mobile)] {
|
|
|
|
+ continue //如果这个活动对应的是主讲人的手机号,那么就不做推送
|
|
|
|
+ }
|
|
if vS.SignupType == 1 {
|
|
if vS.SignupType == 1 {
|
|
outCallStatus = "1"
|
|
outCallStatus = "1"
|
|
} else {
|
|
} else {
|