同步进门财经路演信息

controllers/search.go

@@ -52,25 +52,9 @@ func (this *SearchController) SearchList() {
 		br.Ret = 408
 		return
 	}
-
 	if orderColumn == "" {
 		orderColumn = "Matching"
 	}
-	/*
-		categoryList, err := models.GetCategoryByCompanyId(user.CompanyId)
-		if err != nil {
-			br.Msg = "检索失败！"
-			br.ErrMsg = "检索分类信息失败，Err:" + err.Error()
-			return
-		}
-
-		var categoryNameArr []string
-		for _, v := range categoryList {
-			categoryNameArr = append(categoryNameArr, v.CategoryName)
-		}
-		categoryName := strings.Join(categoryNameArr, ",")
-	*/
-	//indexName := "article_list"
 	indexName := utils.IndexName
 	pageSize = 20
 	var result []*models.SearchItem

services/activity.go

@@ -649,18 +649,27 @@ func LabelStr(label string) (labelNew string) {
 	return labelNew
 }
 
-func ActivityAttendanceDetail() {
+func ActivityAttendanceDetail(cont context.Context) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromWind Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromWind ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+		}
+	}()
 	var mobileStr string
 	fmt.Println("开始同步")
-	dateTime := time.Now().AddDate(0, 0, -2).Format(utils.FormatDate)
+	dateTime := time.Now().AddDate(0, 0, -8).Format(utils.FormatDate)
+	dateNow := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate)
 	startDate := dateTime + " 00:00:00"
-	endDate := dateTime + " 23:59:59"
+	endDate := dateNow + " 23:59:59"
 	//获取需要处理的活动
 	listActivity, err := models.GetActivityListByDateTime(startDate, endDate)
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
-		return
+		return err
 	}
+	fmt.Println(listActivity)
+	fmt.Println(mobileStr)
 	for _, vAct := range listActivity {
 		doTime := utils.TimeRemoveHms2(vAct.ActivityTime)
 		findStartDate := doTime + " 00:00:00"
@@ -674,7 +683,7 @@ func ActivityAttendanceDetail() {
 				list, err := models.GetRoadshowDataList(activityName, findStartDate, findEndDate)
 				if err != nil {
 					fmt.Println("GetTacticsList Err:", err.Error())
-					return
+					return err
 				}
 				needAddAttendanc := make([]*models.CygxActivityAttendanceDetail, 0)
 				fmt.Println("原来的", vAct.ActivityName)
@@ -715,7 +724,7 @@ func ActivityAttendanceDetail() {
 					listUser, err := models.GetWxUserOutboundMobile(mobileStr)
 					if err != nil {
 						fmt.Println("GetWxUserOutboundMobile Err:", err.Error())
-						return
+						return err
 					}
 					for k, v := range needAddAttendanc {
 						for _, v2 := range listUser {
@@ -731,25 +740,34 @@ func ActivityAttendanceDetail() {
 					err = models.AddAttendancDetail(needAddAttendanc, vAct.ActivityId, mobileStr)
 					if err != nil {
 						fmt.Println("AddAttendancDetail Err:", err.Error())
-						return
+						return err
+					}
+					err = AddCygxActivityRestrictSignupByAdmin(vAct.ActivityId)
+					if err != nil {
+						fmt.Println("AddCygxActivityRestrictSignupByAdmin Err:", err.Error())
+						return err
 					}
-					go AddCygxActivityRestrictSignupByAdmin(vAct.ActivityId)
 					err = models.AddCygxActivityMeetDetailLogOnline(needAddAttendanc, vAct.ActivityId)
-					fmt.Println(err)
+					if err != nil {
+						fmt.Println("AddCygxActivityMeetDetailLogOnline Err:", err.Error())
+						return err
+					}
+
 				}
 			}
 		}
 	}
-	fmt.Println("结束同步")
+	fmt.Println("结束路演同步")
+	return
 }
 
-func AddCygxActivityRestrictSignupByAdmin(activityId int) {
-	var msg string
+//判断是否加入黑名单
+func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 	total, err := models.GetActivitySignupNomeetingCount(activityId)
-	fmt.Println(total)
 	if err != nil {
-		utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+		utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
 		fmt.Println(" Err:", err.Error())
+		return err
 	}
 	mobileList, _ := models.GetUserMeetingMobile(activityId)
 	if len(mobileList) >= 0 {
@@ -757,48 +775,55 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) {
 			totalRestrict, err := models.GetRestrictSignupCountByUid(v.UserId)
 			if err != nil {
 				fmt.Println(" Err:", err.Error())
-				utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+				utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+				return err
 			}
 			totalNomeet, err := models.GetActivitySignupNomeetingCountByUid(v.UserId)
 			if err != nil {
 				fmt.Println(" Err:", err.Error())
-				utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+				utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+				return err
 			}
 			if totalRestrict > 0 && totalNomeet < 3 {
 				err = models.DeleteCygxActivityRestrictSignup(v.UserId)
 				if err != nil {
 					fmt.Println(" Err:", err.Error())
-					utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+					utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+					return err
 				}
 			}
 		}
 	}
 
 	if total == 0 {
-		return
+		return err
 	}
 	list, err := models.GetActivitySignupNomeetingCountList(activityId)
-	fmt.Println(list)
 	if err != nil {
-		utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+		utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
 		fmt.Println(" 用户限制报名失败 Err:", err.Error())
+		return err
 	}
 	for _, v := range list {
 		totalRestrict, err := models.GetRestrictSignupCountByUid(v.UserId)
 		if err != nil {
 			fmt.Println(" Err:", err.Error())
-			utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+			utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+			return err
 		}
 		totalNomeet, err := models.GetActivitySignupNomeetingCountByUid(v.UserId)
 		if err != nil {
 			fmt.Println(" Err:", err.Error())
-			utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error(), msg)
+			utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+			return err
 		}
 		if totalNomeet >= 3 {
 			if totalRestrict == 0 {
 				infoUser, err := models.GetUserAndCompanyNameList(v.UserId)
 				if err != nil {
 					fmt.Println(" Err:", err.Error())
+					utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+					return err
 				}
 				if infoUser != nil {
 					item := new(models.CygxActivityRestrictSignup)
@@ -812,9 +837,12 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) {
 					err = models.AddCygxActivityRestrictSignup(item)
 					if err != nil {
 						fmt.Println(" Err:", err.Error())
+						utils.FileLog.Info("用户限制报名失败,Err:%s,%s", err.Error())
+						return err
 					}
 				}
 			}
 		}
 	}
+	return
 }

services/task.go

@@ -53,6 +53,8 @@ func Task() {
 		//更改对应产业的文章阅读数量
 		chageIndustrialArticleNum := task.NewTask("chageIndustrialArticleNum", "0 01 00 * * *", ChageIndustrialArticleNum) //更改对应产业的文章阅读数量
 		task.AddTask("chageIndustrialArticleNum", chageIndustrialArticleNum)
+		activityAttendanceDetail := task.NewTask("activityAttendanceDetail", "0 00 3 * * *", ActivityAttendanceDetail) //同步进门财经的路演信息
+		task.AddTask("sendEmailUserWhiteListChange", activityAttendanceDetail)
 	}
 	//ActivityAttendanceDetail()
 	//SynchronizationArthistory()//同步原有的阅读记录

services/user.go

@@ -1156,7 +1156,9 @@ func SendEmailAllUserWithCompany() (err error) {
 			cellB := row.AddCell()
 			cellB.Value = item.Mobile
 			cellC := row.AddCell()
-			cellC.Value = item.CountryCode
+			if item.CountryCode != "" && item.Mobile != "" {
+				cellC.Value = "+" + item.CountryCode
+			}
 			cellD := row.AddCell()
 			cellD.Value = ""
 			cellE := row.AddCell()