进门财经双向匹配部分匹配不到问题修复

models/activity.go

@@ -201,7 +201,7 @@ func GetActivityListByDateTime(startDate, endDate, activityIds string) (items []
 	sql := `SELECT * FROM cygx_activity WHERE activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' `
 	activityIds = strings.TrimRight(activityIds, ",")
 	if activityIds != "" {
-		sql += ` AND activity_id IN (` + activityIds + `)  `
+		sql += ` AND activity_id  NOT IN (` + activityIds + `)  `
 	}
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

services/activity.go

@@ -651,12 +651,12 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 					fmt.Println("GetTacticsList Err:", err.Error())
 					return err
 				}
-				//fmt.Println("原来的", vAct.RoadshowTitle)
-				//fmt.Println("处理的", activityName)
 
 				needAddAttendanc := make([]*models.CygxActivityAttendanceDetail, 0)
 				var mobileStr string
 				if len(list) > 0 {
+					fmt.Println("原来的", vAct.RoadshowTitle)
+					fmt.Println("处理的", activityName)
 					for _, v := range list {
 						if v.UserPhone != "" {
 							item := new(models.CygxActivityAttendanceDetail)
@@ -718,13 +718,6 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 						fmt.Println("AddCygxActivityRestrictSignupByAdmin Err:", err.Error())
 						return err
 					}
-					////添加报名日志
-					//err = models.AddCygxActivityMeetDetailLogOnline(needAddAttendanc, vAct.ActivityId)
-					//if err != nil {
-					//	fmt.Println("AddCygxActivityMeetDetailLogOnline Err:", err.Error())
-					//	return err
-					//}
-
 				}
 			}
 		}
@@ -738,11 +731,10 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 	}
 	//通过本地去找进门财经的数据
 	for _, vAct := range listActivity {
-		doTime := utils.TimeRemoveHms2(vAct.ActivityName)
+		doTime := utils.TimeRemoveHms2(vAct.ActivityTime)
 		findStartDate := doTime + " 00:00:00"
 		findEndDate := doTime + " 23:59:59"
-		var roadshowTitle string
-		nameSlice := strings.Split(vAct.ActivityName, "|")
+		nameSlice := strings.Split(vAct.ActivityName, "】")
 		//对于手动匹配到的活动数据也要更新
 		var activityName string
 		if len(nameSlice) > 1 {
@@ -751,18 +743,20 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 			} else {
 				activityName = nameSlice[len(nameSlice)-1]
 			}
-			//fmt.Println("原来的1", vAct.ActivityName)
-			//fmt.Println("处理的2", activityName)
-			activityName = nameSlice[len(nameSlice)-1]
+
+			//activityName = nameSlice[len(nameSlice)-1]
 			if activityName != "" {
-				list, err := models.GetRoadshowDataList(roadshowTitle, findStartDate, findEndDate)
+				list, err := models.GetRoadshowDataList(activityName, findStartDate, findEndDate)
 				if err != nil {
 					fmt.Println("GetTacticsList Err:", err.Error())
 					return err
 				}
+
 				needAddAttendanc := make([]*models.CygxActivityAttendanceDetail, 0)
 				var mobileStr string
 				if len(list) > 0 {
+					fmt.Println("原来的1", vAct.ActivityName)
+					fmt.Println("处理的2", activityName)
 					for _, v := range list {
 						if v.UserPhone != "" {
 							item := new(models.CygxActivityAttendanceDetail)