Merge branch 'fix_bug_2021-08-27-10-15' of hongze/hongze_cygx into master

models/activity.go

@@ -407,7 +407,7 @@ func GetSignupExport(activityId int) (item []*SignupExportRep, err error) {
 			LEFT JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
 			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			WHERE a.activity_id = ?  AND s.do_fail_type = 0 GROUP BY s.id `
+			WHERE a.activity_id = ?  AND s.do_fail_type = 0 AND s.signup_type = 1  GROUP BY s.id `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }

services/activity.go

@@ -240,15 +240,20 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 		} else if activityInfo.ChartPermissionName == "策略" || activityInfo.ChartPermissionNames == "研选" {
 			touser = utils.EmailStrategy
 		}
-		go utils.SendEmailHaveFile(title, content, fileName, touser)
+		haveSuccess := utils.SendEmailHaveFile(title, content, fileName, touser)
+		time.Sleep(time.Duration(2) * time.Second) //延迟两秒，避免过多活动的时候邮件发送没有内容
 		defer func() {
 			os.Remove(downLoadnFilePath)
 		}()
-		time.Sleep(time.Duration(2) * time.Second) //延迟两秒，避免过多活动的时候邮件发送没有内容
-		errFile = models.UPdateActivityIdToSendFile(v.ActivityId)
-		if errFile != nil {
-			msg = "获取失败，Err:" + errFile.Error()
-			return
+		if haveSuccess {
+			errFile = models.UPdateActivityIdToSendFile(v.ActivityId)
+			if errFile != nil {
+				msg = "获取失败，Err:" + errFile.Error()
+				return
+			}
+		} else {
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
+			utils.FileLog.Info("发送附件模版消息失败,Err:%s", activityInfo.ActivityName)
 		}
 	}
 	fmt.Println("发送附件完成")