Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/cygx_14.0

controllers/cygx/activity_meet.go

@@ -1639,7 +1639,7 @@ func (this *ActivityMeetCoAntroller) MatchingList() {
 		return
 	}
 	dateTime := detail.ActivityTime
-	dateTime = utils.TimeRemoveHms(dateTime)
+	dateTime = utils.TimeRemoveHms2(dateTime)
 	startTime := dateTime + " 00:00:00'"
 	endTime := dateTime + " 23:59:59'"
 	list, err := cygx.GetRoadshowDataTitleList(startTime, endTime, keyWord)
@@ -1731,7 +1731,7 @@ func (this *ActivityMeetCoAntroller) MatchingByHand() {
 	}
 	var condition string
 	dateTime := detail.ActivityTime
-	dateTime = utils.TimeRemoveHms(dateTime)
+	dateTime = utils.TimeRemoveHms2(dateTime)
 
 	param := new(cygxService.GetYiDongActivityByApiReq)
 	param.MeetingStatus = "2"
@@ -1744,14 +1744,18 @@ func (this *ActivityMeetCoAntroller) MatchingByHand() {
 	//优先匹配易董的活动
 	if len(actList) > 0 {
 		for _, v := range actList {
-			var yidongTitle string
+			var newActivityName string
 			titleSlice := strings.Split(v.Title, "】")
 
 			for _, vt := range titleSlice {
-				yidongTitle = vt
+				newActivityName = strings.Replace(vt, "-", "", -1)
+				newActivityName = strings.Replace(newActivityName, "-", "", -1)
+				newActivityName = strings.Replace(newActivityName, "—", "", -1)
+				newActivityName = strings.Replace(newActivityName, " ", "", -1)
+				newActivityName = strings.Replace(newActivityName, ":", "", -1)
 			}
 			//如果活动时间一致，而且标题还还包含关键词就建立匹配关系
-			if strings.Contains(detail.ActivityNameTask, yidongTitle) && detail.ActivityTime == v.Start {
+			if strings.Contains(detail.ActivityNameTask, newActivityName) && detail.ActivityTime == v.Start {
 				err = cygx.UpdateCygxActivityyidongActivityId(v.ID, activityId)
 				if err != nil {
 					br.Msg = "手动归类失败"