콘텐츠 메인 홈 - 채널별 인기 콘텐츠 채널
- 19금 콘텐츠 안보기 설정시 일반 콘텐츠 판매량으로 채널 조회
This commit is contained in:
parent
dc1c29b69d
commit
e488f3419e
|
@ -83,6 +83,7 @@ class AudioContentMainTabHomeService(
|
||||||
|
|
||||||
val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
|
val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
|
||||||
memberId = member.id!!,
|
memberId = member.id!!,
|
||||||
|
isAdult = isAdult,
|
||||||
contentType = contentType,
|
contentType = contentType,
|
||||||
startDate = startDate.minusDays(1),
|
startDate = startDate.minusDays(1),
|
||||||
endDate = endDate
|
endDate = endDate
|
||||||
|
|
|
@ -409,6 +409,7 @@ class RankingRepository(
|
||||||
|
|
||||||
fun fetchCreatorBySellContentCountRankTop20(
|
fun fetchCreatorBySellContentCountRankTop20(
|
||||||
memberId: Long,
|
memberId: Long,
|
||||||
|
isAdult: Boolean,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
startDate: LocalDateTime,
|
startDate: LocalDateTime,
|
||||||
endDate: LocalDateTime
|
endDate: LocalDateTime
|
||||||
|
@ -422,7 +423,7 @@ class RankingRepository(
|
||||||
.and(order.createdAt.goe(startDate))
|
.and(order.createdAt.goe(startDate))
|
||||||
.and(order.createdAt.lt(endDate))
|
.and(order.createdAt.lt(endDate))
|
||||||
|
|
||||||
var memberCondition = member.isActive.isTrue
|
val memberCondition = member.isActive.isTrue
|
||||||
.and(member.role.eq(MemberRole.CREATOR))
|
.and(member.role.eq(MemberRole.CREATOR))
|
||||||
.and(member.id.eq(audioContent.member.id))
|
.and(member.id.eq(audioContent.member.id))
|
||||||
|
|
||||||
|
@ -432,18 +433,22 @@ class RankingRepository(
|
||||||
.and(audioContent.limited.isNull)
|
.and(audioContent.limited.isNull)
|
||||||
.and(blockMember.id.isNull)
|
.and(blockMember.id.isNull)
|
||||||
|
|
||||||
if (contentType != ContentType.ALL) {
|
if (!isAdult) {
|
||||||
where = where.and(
|
where = where.and(audioContent.isAdult.isFalse)
|
||||||
audioContent.member.auth.isNull.or(
|
} else {
|
||||||
audioContent.member.auth.gender.eq(
|
if (contentType != ContentType.ALL) {
|
||||||
if (contentType == ContentType.MALE) {
|
where = where.and(
|
||||||
0
|
audioContent.member.auth.isNull.or(
|
||||||
} else {
|
audioContent.member.auth.gender.eq(
|
||||||
1
|
if (contentType == ContentType.MALE) {
|
||||||
}
|
0
|
||||||
|
} else {
|
||||||
|
1
|
||||||
|
}
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return queryFactory
|
return queryFactory
|
||||||
|
|
|
@ -189,11 +189,12 @@ class RankingService(
|
||||||
|
|
||||||
fun fetchCreatorBySellContentCountRankTop20(
|
fun fetchCreatorBySellContentCountRankTop20(
|
||||||
memberId: Long,
|
memberId: Long,
|
||||||
|
isAdult: Boolean,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
startDate: LocalDateTime,
|
startDate: LocalDateTime,
|
||||||
endDate: LocalDateTime
|
endDate: LocalDateTime
|
||||||
): List<ContentCreatorResponse> {
|
): List<ContentCreatorResponse> {
|
||||||
return repository.fetchCreatorBySellContentCountRankTop20(memberId, contentType, startDate, endDate)
|
return repository.fetchCreatorBySellContentCountRankTop20(memberId, isAdult, contentType, startDate, endDate)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun fetchCreatorContentBySalesCountTop4(
|
fun fetchCreatorContentBySalesCountTop4(
|
||||||
|
|
Loading…
Reference in New Issue