no message

models/activity_signup.go

@@ -7,21 +7,22 @@ import (
 )
 
 type CygxActivitySignup struct {
-	Id             int       `orm:"column(id);pk"`
-	ActivityId     int       `description:"活动ID"`
-	UserId         int       `description:"用户ID"`
-	CreateTime     time.Time `description:"创建时间"`
-	Mobile         string    `description:"手机号"`
-	Email          string    `description:"邮箱"`
-	CompanyId      int       `description:"公司id"`
-	CompanyName    string    `description:"公司名称"`
-	FailType       int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
-	SignupType     int       `description:"报名方式，1预约外呼，2自主拨入，3我要报名"`
-	DoFailType     int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
-	OutboundMobile string    `description:"外呼手机号"`
-	CountryCode    string    `description:"手机国家区号"`
-	RealName       string    `description:"用户实际名称"`
-	SellerName     string    `description:"所属销售"`
+	Id               int       `orm:"column(id);pk"`
+	ActivityId       int       `description:"活动ID"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	FailType         int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
+	SignupType       int       `description:"报名方式，1预约外呼，2自主拨入，3我要报名"`
+	DoFailType       int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
+	OutboundMobile   string    `description:"外呼手机号"`
+	CountryCode      string    `description:"手机国家区号"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 type SignupStatus struct {

services/resource_data.go

@@ -246,7 +246,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
 		}
 	}
-
+	mapActivityVideoId := make(map[int]int)
 	//处理路活动视频
 	if len(activityvideoIds) > 0 {
 		pars = make([]interface{}, 0)
@@ -258,7 +258,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
-
+		fmt.Println(activityVideoList, "activityVideoList")
 		//// 获取默认图配置
 		_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
 		if e != nil {
@@ -266,10 +266,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range activityVideoList {
+			fmt.Println(v.ActivityId)
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
+
+			mapActivityVideoId[v.VideoId] = v.ActivityId
+			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
 			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
 		}
 	}
@@ -328,7 +331,11 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	}
 	for _, vList := range list {
 		for _, v := range mapItems {
+
 			if v.SourceId == vList.SourceId {
+				if v.Source == "activityvideo" {
+					v.SourceId = mapActivityVideoId[v.SourceId]
+				}
 				items = append(items, v)
 			}
 		}