邮件附件预览样式修改

services/activity.go

@@ -20,10 +20,8 @@ func UpdateActivitySattus(cont context.Context) (err error) {
 			fmt.Println("同步失败，Err:", err.Error())
 		}
 	}()
-	fmt.Println("修改状态6661")
 	go models.UpdateActivitySattusToHaveInHand()
 	go models.UpdateActivitySattusToComplete()
-	fmt.Println("修改状态完成")
 	return
 }
 
@@ -34,7 +32,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 			fmt.Println("发送失败，Err:", err.Error())
 		}
 	}()
-	endDate := time.Now().Add(+time.Minute * 60).Format("2006-01-02 15:04:05")
+	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
 	listActivity, err := models.GetActivitySendMsgListAll(endDate)
 	fmt.Println(len(listActivity))
 	if err != nil {
@@ -73,7 +71,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 	err = models.UPdateSendedMsgStatus(signupIds)
 	if err != nil {
 		var msg string
-		go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+		go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 		utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
 	}
 	return
@@ -86,9 +84,8 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 			fmt.Println("发送失败，Err:", err.Error())
 		}
 	}()
-	endDate := time.Now().Add(+time.Minute * 15).Format("2006-01-02 15:04:05")
+	endDate := time.Now().Add(+time.Minute * 15).Format(utils.FormatDateTime)
 	listActivity, err := models.GetActivitySendMsgListAllMeeting(endDate)
-	fmt.Println(len(listActivity))
 	if err != nil {
 		fmt.Println("GetActivitySendMsgListAll Err:", err.Error())
 		return
@@ -103,7 +100,6 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 		var reserveResults string
 		var first string
 		openIdItem := new(models.OpenIdList)
-		//openIdItem.OpenId = "oN0jD1QwcA2uRD0BC4mH5zJMo0eg"
 		openIdItem.OpenId = v.OpenId
 		openIdList := make([]*models.OpenIdList, 0)
 		openIdList = append(openIdList, openIdItem)
@@ -118,7 +114,7 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 	err = models.UPdateSendedMsgMeetingStatus(signupIds)
 	if err != nil {
 		var msg string
-		go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+		go utils.SendEmail("发送模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 		utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
 	}
 	return
@@ -131,7 +127,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("err：", err)
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
@@ -139,8 +135,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
-	fmt.Println("发送附件")
-	endDate := time.Now().Add(+time.Minute * 60).Format("2006-01-02 15:04:05")
+	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
 	total, err := models.GetCountActivityIdToSendFile(endDate)
 
 	if total == 0 {
@@ -158,7 +153,6 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 	}
 
 	for _, v := range listActivity {
-		fmt.Println(v.ActivityId)
 		activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
 		if activityInfo == nil {
 			msg = "活动不存在，Err:activityId：" + strconv.Itoa(v.ActivityId)
@@ -191,6 +185,9 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 			msg = "新增Sheet失败,Err:" + errFile.Error()
 			return
 		}
+		//设置宽度
+		_ = sheet.SetColWidth(1, 1, 15)
+		_ = sheet.SetColWidth(3, 3, 30)
 		//标头
 		rowTitle := sheet.AddRow()
 		cellA := rowTitle.AddCell()
@@ -240,7 +237,6 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 		} else if activityInfo.ChartPermissionName == "策略" || activityInfo.ChartPermissionNames == "研选" {
 			touser = utils.EmailStrategy
 		}
-		//haveSuccess := utils.SendEmailHaveFile(title, content, fileName, touser)
 		sendResult := utils.SendEmailByHongze(title, content, touser, fileName, title+".xlsx")
 		if sendResult {
 			errFile = models.UPdateActivityIdToSendFile(v.ActivityId)
@@ -250,7 +246,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 			}
 			os.Remove(downLoadnFilePath)
 		} else {
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", activityInfo.ActivityName)
 		}
 	}
@@ -401,7 +397,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("err：", err)
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
@@ -409,7 +405,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
-	endDate := time.Now().Add(+time.Minute * 60).Format("2006-01-02 15:04:05")
+	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
 	condition := `AND  a.activity_type_id = 1 AND a.chart_permission_name = '研选' `
 	total, err := models.GetCountActivityResearchToSendFile(condition, endDate)
 	if total == 0 {
@@ -426,7 +422,6 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 		return
 	}
 	for _, v := range listActivity {
-		fmt.Println(v.ActivityId)
 		activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
 		if activityInfo == nil {
 			msg = "活动不存在，Err:activityId：" + strconv.Itoa(v.ActivityId)
@@ -459,6 +454,8 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 			msg = "新增Sheet失败,Err:" + errFile.Error()
 			return
 		}
+		//设置宽度
+		_ = sheet.SetColWidth(1, 1, 30)
 		//标头
 		rowTitle := sheet.AddRow()
 		cellA := rowTitle.AddCell()
@@ -489,7 +486,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 		title := activityInfo.ActivityName + "-活动带问"
 		content := "活动带问详情"
 		fileName := downLoadnFilePath
-		if utils.WxMsgTemplateIdAskMsgMobile == "" {
+		if utils.RunMode == "release" {
 			touser = "cxzhang@hzinsights.com;ywang@hzinsights.com;tshen@hzinsights.com"
 		} else {
 			touser = "cxzhang@hzinsights.com;jhwang@hzinsights.com;tshen@hzinsights.com"
@@ -503,7 +500,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 			}
 			os.Remove(downLoadnFilePath)
 		} else {
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.RunMode), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", activityInfo.ActivityName)
 		}
 	}
@@ -516,16 +513,14 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 	var touser string
 	defer func() {
 		if err != nil {
-			fmt.Println("err：", err)
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
-			fmt.Println(msg)
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
-	endDate := time.Now().Add(+time.Minute * 15).Format("2006-01-02 15:04:05")
+	endDate := time.Now().Add(+time.Minute * 15).Format(utils.FormatDateTime)
 	condition := `AND  a.activity_type_id = 1 AND  a.chart_permission_name != '研选' `
 	total, err := models.GetCountActivityResearchToSendFile(condition, endDate)
 	if total == 0 {
@@ -547,7 +542,6 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 		return
 	}
 	for _, v := range listActivity {
-		fmt.Println(v.ActivityId)
 		activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
 		if activityInfo == nil {
 			msg = "活动不存在，Err:activityId：" + strconv.Itoa(v.ActivityId)
@@ -563,12 +557,16 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 				touser += v.Email + ";"
 			}
 		}
-		if touser != "" {
+		if touser == "" {
+			msg = "没有对应的邮箱"
+			return
+		}
+		if utils.RunMode == "release" {
 			touser += "tshen@hzinsights.com;cxzhang@hzinsights.com"
 		} else {
-			fmt.Println("没有对应的邮箱")
-			return
+			touser = "tshen@hzinsights.com;cxzhang@hzinsights.com"
 		}
+
 		//创建excel
 		dir, errFile := os.Executable()
 		exPath := filepath.Dir(dir)
@@ -591,6 +589,8 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 			msg = "新增Sheet失败,Err:" + errFile.Error()
 			return
 		}
+		//设置宽度
+		_ = sheet.SetColWidth(1, 1, 30)
 		//标头
 		rowTitle := sheet.AddRow()
 		cellA := rowTitle.AddCell()
@@ -620,7 +620,6 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 		title := activityInfo.ActivityName + "-活动带问"
 		content := "活动带问详情"
 		fileName := downLoadnFilePath
-		//haveSuccess := utils.SendEmailHaveFile(title, content, fileName, touser)
 		sendResult := utils.SendEmailByHongze(title, content, touser, fileName, title+".xlsx")
 		if sendResult {
 			errFile = models.UPdateActivityMsgToSendFile(v.ActivityId)
@@ -630,7 +629,7 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 			}
 			os.Remove(downLoadnFilePath)
 		} else {
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+activityInfo.ActivityName, utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", activityInfo.ActivityName)
 		}
 	}

services/user.go

@@ -598,11 +598,10 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("err：", err, time.Now())
-			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
-			fmt.Println(msg)
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
@@ -614,7 +613,6 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	if mobileStr == "" {
 		mobileStr = "1"
 	}
-	fmt.Println("发送附件")
 	//手机号新增
 	fieldStr = ` u.mobile,u.country_code,u.real_name,c.company_name,u.company_id,cp.seller_name,cp.status,`
 	condition = `  AND cp.status IN ( '正式', '试用' ) AND u.mobile IN (` + mobileStr + `) `
@@ -666,6 +664,10 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 		msg = "新增Sheet失败,Err:" + err.Error()
 		return
 	}
+	//设置宽度
+	_ = sheet.SetColWidth(2, 2, 15)
+	_ = sheet.SetColWidth(6, 6, 30)
+	_ = sheet.SetColWidth(13, 13, 35)
 	//标头
 	rowTitle := sheet.AddRow()
 	cellA := rowTitle.AddCell()
@@ -751,9 +753,9 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	var sendResult bool
 	if len(rep.List) > 0 {
 		sendResult = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
-		//sendResult = utils.SendEmailByHongze(title, content, "cxzhang@hzinsights.com", fileName, title+".xlsx")
+
 	}
-	fmt.Println(sendResult)
+
 	os.Remove(downLoadnFilePath)
 	//创建冻结excel
 	dir, errFile = os.Executable()
@@ -777,6 +779,10 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 		msg = "新增Sheet失败,Err:" + err.Error()
 		return
 	}
+	//设置宽度
+	_ = sheet.SetColWidth(2, 2, 15)
+	_ = sheet.SetColWidth(6, 6, 30)
+	_ = sheet.SetColWidth(13, 13, 35)
 	//标头
 	rowTitle = sheet.AddRow()
 	cellA = rowTitle.AddCell()
@@ -870,12 +876,10 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	var sendResult2 bool
 	if len(listFrozen) > 0 {
 		sendResult2 = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
-		//sendResult2 = utils.SendEmailByHongze(title, content, "cxzhang@hzinsights.com", fileName, title+".xlsx")
 	}
-	fmt.Println(sendResult2)
 	os.Remove(downLoadnFilePaths)
+	//更新名单表
 	if sendResult {
-		fmt.Println(len(listMobile))
 		if len(listMobile) > 0 {
 			for _, v := range listMobile {
 				item := new(models.WxUserWhite)
@@ -896,7 +900,6 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 			}
 		}
 		if len(listOutboundMobile) > 0 {
-			fmt.Println(len(listOutboundMobile))
 			for _, v := range listOutboundMobile {
 				item := new(models.WxUserWhite)
 				item.OutboundMobile = v.Mobile