|
@@ -166,10 +166,12 @@ func getMicroRoadShowDataRatio(pageSize int) (audioRatio, videoRatio, audioPageN
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
-// GetMicroRoadShowDefaultImgConfig 获取微路演默认图配置
|
|
|
|
-func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap map[int]string, err error) {
|
|
|
|
|
|
+// GetMicroRoadShowDefaultImgConfig 获取微路演默认图/分享图配置
|
|
|
|
+func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap, audioShareMap, videoShareMap map[int]string, err error) {
|
|
audioMap = make(map[int]string, 0)
|
|
audioMap = make(map[int]string, 0)
|
|
videoMap = make(map[int]string, 0)
|
|
videoMap = make(map[int]string, 0)
|
|
|
|
+ audioShareMap = make(map[int]string, 0)
|
|
|
|
+ videoShareMap = make(map[int]string, 0)
|
|
key := models.MicroRoadshowDefaultImgKey
|
|
key := models.MicroRoadshowDefaultImgKey
|
|
conf, e := models.GetConfigByCode(key)
|
|
conf, e := models.GetConfigByCode(key)
|
|
if e != nil {
|
|
if e != nil {
|
|
@@ -188,10 +190,12 @@ func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap map[int]string, err
|
|
audioList := list.Audio
|
|
audioList := list.Audio
|
|
for i := range audioList {
|
|
for i := range audioList {
|
|
audioMap[audioList[i].ChartPermissionId] = audioList[i].ImgUrl
|
|
audioMap[audioList[i].ChartPermissionId] = audioList[i].ImgUrl
|
|
|
|
+ audioShareMap[audioList[i].ChartPermissionId] = audioList[i].ShareImg
|
|
}
|
|
}
|
|
videoList := list.Video
|
|
videoList := list.Video
|
|
for i := range videoList {
|
|
for i := range videoList {
|
|
videoMap[videoList[i].ChartPermissionId] = videoList[i].ImgUrl
|
|
videoMap[videoList[i].ChartPermissionId] = videoList[i].ImgUrl
|
|
|
|
+ videoShareMap[videoList[i].ChartPermissionId] = videoList[i].ShareImg
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -219,7 +223,7 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
|
|
}
|
|
}
|
|
|
|
|
|
// 获取默认图配置
|
|
// 获取默认图配置
|
|
- audioMap, videoMap, e := GetMicroRoadShowDefaultImgConfig()
|
|
|
|
|
|
+ audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
|
|
if e != nil {
|
|
if e != nil {
|
|
err = errors.New("获取微路演默认图配置失败, Err: " + e.Error())
|
|
err = errors.New("获取微路演默认图配置失败, Err: " + e.Error())
|
|
return
|
|
return
|
|
@@ -275,6 +279,12 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
|
|
ad.AudioImgUrl = videoMap[ad.AudioChartPermissionId]
|
|
ad.AudioImgUrl = videoMap[ad.AudioChartPermissionId]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ // 分享图
|
|
|
|
+ if ad.AudioType == 1 {
|
|
|
|
+ ad.AudioShareImg = audioShareMap[ad.AudioChartPermissionId]
|
|
|
|
+ } else {
|
|
|
|
+ ad.AudioShareImg = videoShareMap[ad.AudioChartPermissionId]
|
|
|
|
+ }
|
|
// 权限
|
|
// 权限
|
|
au := new(models.UserPermissionAuthInfo)
|
|
au := new(models.UserPermissionAuthInfo)
|
|
au.SellerName = authInfo.SellerName
|
|
au.SellerName = authInfo.SellerName
|
|
@@ -305,4 +315,4 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
|
|
resp = append(resp, item)
|
|
resp = append(resp, item)
|
|
}
|
|
}
|
|
return
|
|
return
|
|
-}
|
|
|
|
|
|
+}
|