|
@@ -98,7 +98,7 @@ func GetMediaById(mediaType string, mediaId int, isLogin bool, userId int) (medi
|
|
|
err = exception.New(exception.MediaFoundFailed)
|
|
|
return
|
|
|
}
|
|
|
- return DealMediaInfo(&mediaInfo, isLogin, userId, mappingRiskLevel, true)
|
|
|
+ return DealMediaInfo(&mediaInfo, isLogin, userId, mappingRiskLevel)
|
|
|
}
|
|
|
func GetMediaPageByAnalystId(mediaType string, pageInfo page.PageInfo, analystId int, mediaIds []int, userId int, mappingRiskLevel string) (list []mediaService.MediaDTO, err error) {
|
|
|
list, err = mediaService.GetMediaPageByAnalystId(mediaType, pageInfo, analystId, mediaIds)
|
|
@@ -144,7 +144,7 @@ func GetMediaPermissionNames(id []int) (labels []string) {
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
-func DealMediaInfo(media *mediaService.MediaDTO, isLogin bool, templateUserId int, mappingRiskLevel string, isDetail bool) (resultMedia *mediaService.MediaDTO, err error) {
|
|
|
+func DealMediaInfo(media *mediaService.MediaDTO, isLogin bool, templateUserId int, mappingRiskLevel string) (resultMedia *mediaService.MediaDTO, err error) {
|
|
|
idStr := strings.Split(media.PermissionIDs, ",")
|
|
|
var ids []int
|
|
|
ids, err = stringUtils.StringToIntSlice(idStr)
|
|
@@ -193,7 +193,7 @@ func DealMediaInfo(media *mediaService.MediaDTO, isLogin bool, templateUserId in
|
|
|
media.IsSubscribe = false
|
|
|
media.IsPackage = false
|
|
|
} else {
|
|
|
- media.Price = defaultProductPrice
|
|
|
+ media.Price = packageList[0].Price
|
|
|
media.IsFree = false
|
|
|
media.IsSubscribe = false
|
|
|
media.IsPackage = true
|
|
@@ -253,7 +253,7 @@ func dealMediaInfo(list []mediaService.MediaDTO, isLogin bool, templateUserId in
|
|
|
for i := 0; i < len(list); i++ {
|
|
|
go func(media *mediaService.MediaDTO) {
|
|
|
defer wg.Done()
|
|
|
- media, err = DealMediaInfo(media, isLogin, templateUserId, mappingRiskLevel, false)
|
|
|
+ media, err = DealMediaInfo(media, isLogin, templateUserId, mappingRiskLevel)
|
|
|
if err != nil {
|
|
|
logger.Error("处理媒体信息失败:%v", err)
|
|
|
}
|