Merge branch 'cygx_shoudong_need4.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -157,6 +157,7 @@ type CygxActivityList struct {
 	ImgUrl                  string `description:"图片链接"`
 	ImgUrlText              string `description:"图片链接文字"`
 	ActivityType            int    `description:"活动线上线下类型 1线上，0 线下"`
+	JmcjRoadshowTitle       string `description:"进门财经手动匹配的活动名称"`
 }
 
 type GetCygxActivityListRep struct {

services/activity.go

@@ -613,9 +613,14 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 		findEndDate := doTime + " 23:59:59"
 		nameSlice := strings.Split(vAct.ActivityName, "】")
 		//fmt.Println(timeSlice[0])
+		//对于手动匹配到的活动数据也要更新
 		var activityName string
-		if len(nameSlice) > 1 {
-			activityName = nameSlice[len(nameSlice)-1]
+		if len(nameSlice) > 1 || vAct.JmcjRoadshowTitle != "" {
+			if vAct.JmcjRoadshowTitle != "" {
+				activityName = vAct.JmcjRoadshowTitle
+			} else {
+				activityName = nameSlice[len(nameSlice)-1]
+			}
 			if activityName != "" {
 				list, err := models.GetRoadshowDataList(activityName, findStartDate, findEndDate)
 				if err != nil {