活动带问模板消息 添加销售的接收

controllers/activity.go

@@ -2059,18 +2059,6 @@ func (this *ActivityCoAntroller) AskAdd() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
-	//resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
-	//if activityInfo.ActivityTypeId == 1 && activityInfo.ChartPermissionId != 31 {
-	//	if time.Now().After(resultTime.Add(-time.Minute * 15)) {
-	//		br.Msg = "活动开始前15分钟内无法提交问题"
-	//		return
-	//	}
-	//} else {
-	//	if time.Now().After(resultTime.Add(-time.Minute * 60)) {
-	//		br.Msg = "活动开始前1小时内无法提交问题"
-	//		return
-	//	}
-	//}
 	companyDetail, err := models.GetCompanyDetailById(user.CompanyId)
 	if err != nil {
 		br.Msg = "提交失败！"
@@ -2125,21 +2113,30 @@ func (this *ActivityCoAntroller) AskAdd() {
 		if activityInfo.ChartPermissionId == 31 {
 			sendMobile = utils.ActSendMsgMobile
 		}
+
+		//获取销售信息
+		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "提交失败"
+			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+			return
+		}
+		//给研究员发送消息
 		if sendMobile != "" {
 			openIpItem, _ := models.GetUserRecordByMobile(4, sendMobile)
 			if openIpItem != nil && openIpItem.OpenId != "" {
-				//获取销售信息
-				sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-				if err != nil && err.Error() != utils.ErrNoRow() {
-					br.Msg = "提交失败"
-					br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
-					return
-				}
 				if sellerItem != nil {
 					services.SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
 				}
 			}
 		}
+		// 给所属销售发送消息
+		if sellerItem != nil {
+			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+			if openIpItem != nil && openIpItem.OpenId != "" {
+				services.SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
+			}
+		}
 	}
 
 	br.Ret = 200

services/activity.go

@@ -452,15 +452,23 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				return err
 			}
-			openIpItem, _ := models.GetUserRecordByMobile(4, utils.ActSendMsgMobile)
-			if openIpItem != nil && openIpItem.OpenId != "" {
-				//获取销售信息
-				sellerItem, err := models.GetSellerByCompanyIdCheckFicc(v2.CompanyId, 2)
-				if err != nil && err.Error() != utils.ErrNoRow() {
-					return err
+			//获取销售信息
+			sellerItem, err := models.GetSellerByCompanyIdCheckFicc(v2.CompanyId, 2)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				return err
+			}
+			//给研究员推送消息
+			if sellerItem != nil {
+				openIpItem, _ := models.GetUserRecordByMobile(4, utils.ActSendMsgMobile)
+				if openIpItem != nil && openIpItem.OpenId != "" {
+					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", v2.CreateTime, v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
 				}
-				if sellerItem != nil {
-					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", time.Now().Format(utils.FormatDateTime), v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
+			}
+			//给所属销售推送消息
+			if sellerItem != nil {
+				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+				if openIpItem != nil && openIpItem.OpenId != "" {
+					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", v2.CreateTime, v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
 				}
 			}
 		}
@@ -507,99 +515,6 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 		msg = "获取失败，Err:" + errEmail.Error()
 		return
 	}
-	//for _, v := range listActivity {
-	//	activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
-	//	if activityInfo == nil {
-	//		msg = "活动不存在，Err:activityId：" + strconv.Itoa(v.ActivityId)
-	//		return
-	//	}
-	//	list, errFile := models.GetActivityMsgExport(v.ActivityId)
-	//	if errFile != nil {
-	//		msg = "获取失败，Err:" + errFile.Error()
-	//		return
-	//	}
-	//	for _, v := range listEmail {
-	//		if strings.Index(activityInfo.Host, v.Name) > 0 {
-	//			touser += v.Email + ";"
-	//		}
-	//	}
-	//	if touser == "" {
-	//		msg = "没有对应的邮箱"
-	//		return
-	//	}
-	//	if utils.RunMode == "release" {
-	//		touser += "tshen@hzinsights.com;cxzhang@hzinsights.com"
-	//	} else {
-	//		touser = "tshen@hzinsights.com;cxzhang@hzinsights.com"
-	//	}
-	//
-	//	//创建excel
-	//	dir, errFile := os.Executable()
-	//	exPath := filepath.Dir(dir)
-	//	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + utils.GetRandDigit(5) + ".xlsx"
-	//	xlsxFile := xlsx.NewFile()
-	//	if errFile != nil {
-	//		msg = "生成文件失败Err:" + errFile.Error()
-	//		return
-	//	}
-	//	style := xlsx.NewStyle()
-	//	alignment := xlsx.Alignment{
-	//		Horizontal: "center",
-	//		Vertical:   "center",
-	//		WrapText:   true,
-	//	}
-	//	style.Alignment = alignment
-	//	style.ApplyAlignment = true
-	//	sheet, errFile := xlsxFile.AddSheet("外呼名单")
-	//	if errFile != nil {
-	//		msg = "新增Sheet失败,Err:" + errFile.Error()
-	//		return
-	//	}
-	//	//设置宽度
-	//	_ = sheet.SetColWidth(1, 1, 30)
-	//	_ = sheet.SetColWidth(2, 2, 60)
-	//	//标头
-	//	rowTitle := sheet.AddRow()
-	//	cellA := rowTitle.AddCell()
-	//	cellA.Value = "姓名"
-	//	cellB := rowTitle.AddCell()
-	//	cellB.Value = "公司名称"
-	//	cellC := rowTitle.AddCell()
-	//	cellC.Value = "问题"
-	//	cellD := rowTitle.AddCell()
-	//	cellD.Value = "提交时间"
-	//	for _, item := range list {
-	//		row := sheet.AddRow()
-	//		cellA := row.AddCell()
-	//		cellA.Value = item.RealName
-	//		cellB := row.AddCell()
-	//		cellB.Value = item.CompanyName
-	//		cellC := row.AddCell()
-	//		cellC.Value = item.Content
-	//		cellD := row.AddCell()
-	//		cellD.Value = item.CreateTime
-	//	}
-	//	errFile = xlsxFile.Save(downLoadnFilePath)
-	//	if errFile != nil {
-	//		msg = "保存文件失败Err:" + errFile.Error()
-	//		return
-	//	}
-	//	title := activityInfo.ActivityName + "-活动带问"
-	//	content := "活动带问详情"
-	//	fileName := downLoadnFilePath
-	//	sendResult := utils.SendEmailByHongze(title, content, touser, fileName, title+".xlsx")
-	//	if sendResult {
-	//		errFile = models.UPdateActivityMsgToSendFile(v.ActivityId)
-	//		if errFile != nil {
-	//			msg = "获取失败，Err:" + errFile.Error()
-	//			return
-	//		}
-	//		os.Remove(downLoadnFilePath)
-	//	} else {
-	//		go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
-	//		utils.FileLog.Info("发送附件模版消息失败,Err:%s", activityInfo.ActivityName)
-	//	}
-	//}
 
 	for _, v := range listActivity {
 		activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
@@ -624,15 +539,23 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 					sendMobile = vEmail.Mobile
 				}
 			}
-			openIpItem, _ := models.GetUserRecordByMobile(4, sendMobile)
-			if openIpItem != nil && openIpItem.OpenId != "" {
-				//获取销售信息
-				sellerItem, err := models.GetSellerByCompanyIdCheckFicc(v2.CompanyId, 2)
-				if err != nil && err.Error() != utils.ErrNoRow() {
-					return err
+			//获取销售信息
+			sellerItem, err := models.GetSellerByCompanyIdCheckFicc(v2.CompanyId, 2)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				return err
+			}
+			//给研究员推送模板消息
+			if sellerItem != nil {
+				openIpItem, _ := models.GetUserRecordByMobile(4, sendMobile)
+				if openIpItem != nil && openIpItem.OpenId != "" {
+					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", v2.CreateTime, v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
 				}
-				if sellerItem != nil {
-					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", time.Now().Format(utils.FormatDateTime), v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
+			}
+			//给销售推送模板消息
+			if sellerItem != nil {
+				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+				if openIpItem != nil && openIpItem.OpenId != "" {
+					SendActivityAskApplyTemplateMsg(user.RealName+"——"+user.CompanyName+"(所属销售："+sellerItem.RealName+"）", v2.CreateTime, v2.Content, activityInfo.ActivityName, openIpItem.OpenId, activityInfo.ActivityId)
 				}
 			}
 		}