no message

services/yidong.go

@@ -555,7 +555,6 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 	condition += ` AND   activity_time > ` + "'" + startDate + "'"
 	condition += ` AND  activity_time < ` + "'" + endDate + "'"
 	//fmt.Println(startDate)
-
 	artivityListYidong, err := models.GetActivityListByYidong(condition)
 	if err != nil {
 		fmt.Println("GetActivityListByYidong Err:", err.Error())
@@ -627,6 +626,7 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 		}
 		var mobiles []string
 		var mobileStr string
+		var mobileStrMeet string
 		mapActivityAttendanceDetail := make(map[string]*models.CygxActivityAttendanceDetail)
 		if len(ApifoxModal.Result) > 0 {
 			itemlog := new(models.CygxYidongActivityMeetingApiLog)
@@ -640,6 +640,7 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 			}
 			var itemsUpdate []*models.CygxActivitySignupDetail
 			needAddAttendanc := make([]*models.CygxActivityAttendanceDetail, 0)
+
 			for _, vresult := range ApifoxModal.Result {
 				if vresult.EndTime != "" {
 					mobiles = append(mobiles, vresult.PersonTelephone)
@@ -662,8 +663,23 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 					mapActivityAttendanceDetail[vresult.PersonTelephone].Duration = utils.GetAttendanceDetailSecondsByYiDong(vresult.Duration)
 					itemsUpdate = append(itemsUpdate, itemDetail)
 				}
+
+				item := new(models.CygxActivityAttendanceDetail)
+				item.ActivityId = v.ActivityId
+				item.Mobile = vresult.PersonTelephone
+				if vresult.Duration != "" {
+					item.FirstMeetingTime = vresult.StartTime
+					item.LastMeetingTime = vresult.EndTime
+					item.Duration = vresult.Duration
+					item.IsMeetingStr = 1
+					mobileStrMeet += "'" + vresult.PersonTelephone + "'" + ","
+
+				}
+				mobileStr += "'" + vresult.PersonTelephone + "'" + ","
+				item.CreateTime = time.Now()
+				needAddAttendanc = append(needAddAttendanc, item)
+
 			}
-			fmt.Println(mobiles)
 			lenmobiles := len(mobiles)
 			if lenmobiles > 0 {
 				var parsYd []interface{}
@@ -680,58 +696,64 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 					fmt.Println("UpdateActivitySignupDetailMultiByYiDong Err:", err.Error())
 					return err
 				}
-				var condition string
-				var pars []interface{}
-				condition = ` AND do_fail_type = 0 AND mobile IN (` + utils.GetOrmInReplace(lenmobiles) + `) AND activity_id = ?`
-				pars = append(pars, mobiles, v.ActivityId)
-				listSignup, e := models.GetActivitySignupList(condition, pars)
-				if e != nil {
-					err = errors.New("GetActivitySignupList, Err: " + e.Error())
-					return err
-				}
-
-				for _, vSignup := range listSignup {
-					item := new(models.CygxActivityAttendanceDetail)
-					item.ActivityId = vSignup.ActivityId
-					item.RealName = vSignup.RealName
-					item.Mobile = vSignup.Mobile
-					item.CompanyName = vSignup.CompanyName
-					if mapActivityAttendanceDetail[vSignup.Mobile] != nil {
-						item.FirstMeetingTime = mapActivityAttendanceDetail[vSignup.Mobile].FirstMeetingTime
-						item.LastMeetingTime = mapActivityAttendanceDetail[vSignup.Mobile].LastMeetingTime
-						item.Duration = mapActivityAttendanceDetail[vSignup.Mobile].Duration
-						item.IsMeetingStr = 1
-						mobileStr += "'" + vSignup.Mobile + "'" + ","
-					}
-					item.CreateTime = time.Now()
-					needAddAttendanc = append(needAddAttendanc, item)
-				}
+				//var condition string
+				//var pars []interface{}
+				//condition = ` AND do_fail_type = 0 AND mobile IN (` + utils.GetOrmInReplace(lenmobiles) + `) AND activity_id = ?`
+				//pars = append(pars, mobiles, v.ActivityId)
+				//listSignup, e := models.GetActivitySignupList(condition, pars)
+				//if e != nil {
+				//	err = errors.New("GetActivitySignupList, Err: " + e.Error())
+				//	return err
+				//}
+
+				//for _, vSignup := range listSignup {
+				//	item := new(models.CygxActivityAttendanceDetail)
+				//	item.ActivityId = vSignup.ActivityId
+				//	item.RealName = vSignup.RealName
+				//	item.Mobile = vSignup.Mobile
+				//	item.CompanyName = vSignup.CompanyName
+				//	if mapActivityAttendanceDetail[vSignup.Mobile] != nil {
+				//		item.FirstMeetingTime = mapActivityAttendanceDetail[vSignup.Mobile].FirstMeetingTime
+				//		item.LastMeetingTime = mapActivityAttendanceDetail[vSignup.Mobile].LastMeetingTime
+				//		item.Duration = mapActivityAttendanceDetail[vSignup.Mobile].Duration
+				//		item.IsMeetingStr = 1
+				//		mobileStr += "'" + vSignup.Mobile + "'" + ","
+				//	}
+				//	item.CreateTime = time.Now()
+				//	needAddAttendanc = append(needAddAttendanc, item)
+				//}
 			}
 
 			mobileStr = strings.TrimRight(mobileStr, ",")
 			if mobileStr == "" {
 				mobileStr = "1"
 			}
+			mobileStrMeet = strings.TrimRight(mobileStrMeet, ",")
+			if mobileStrMeet == "" {
+				mobileStrMeet = "1"
+			}
+
 			listUser, err := models.GetWxUserOutboundMobile(mobileStr)
 			if err != nil {
 				fmt.Println("GetWxUserOutboundMobile Err:", err.Error())
 				return err
 			}
-			for k, v := range needAddAttendanc {
+
+			for kAdd, vAdd := range needAddAttendanc {
 				for _, v2 := range listUser {
-					if v2.OutboundMobile == v.Mobile || v2.Mobile == v.Mobile {
-						if needAddAttendanc[k].CompanyId == 0 {
-							needAddAttendanc[k].CompanyId = v2.CompanyId
-							needAddAttendanc[k].SellerName = v2.SellerName
-							needAddAttendanc[k].CompanyName = v2.CompanyName
-							needAddAttendanc[k].IsMeetingStr = 1
+					if v2.OutboundMobile == vAdd.Mobile || v2.Mobile == vAdd.Mobile {
+						if needAddAttendanc[kAdd].CompanyId <= 1 {
+							needAddAttendanc[kAdd].CompanyId = v2.CompanyId
+							needAddAttendanc[kAdd].SellerName = v2.SellerName
+							needAddAttendanc[kAdd].CompanyName = v2.CompanyName
+							//needAddAttendanc[k].IsMeetingStr = 1
 						}
 					}
 				}
 			}
 			//fmt.Println(mobileStr)
 			//参会记录
-			err = models.AddAttendancDetail(needAddAttendanc, v.ActivityId, mobileStr)
+			err = models.AddAttendancDetail(needAddAttendanc, v.ActivityId, mobileStrMeet)
 			if err != nil {
 				fmt.Println("AddAttendancDetail Err:", err.Error())
 				return err
@@ -742,7 +764,7 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 				fmt.Println("AddCygxActivityRestrictSignupByAdmin Err:", err.Error())
 				return err
 			}
-
+			fmt.Println(len(needAddAttendanc))
 			go AddctivitySignupDetailByJmcj(needAddAttendanc, v.ActivityId)
 		}
 	}