klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test #316

Merged
klaus merged 20 commits from test into main 2025-05-20 06:03:11 +00:00
Conversation 0 Commits 20 Files Changed 29 +28 -32
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36b8e8169e - Show all commits

26
src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
View File

@ -102,14 +102,17 @@ class UserActionService(
) )
if (grantedCount >= policy.availableCount) return@execute if (grantedCount >= policy.availableCount) return@execute
grantLogRepository.save( val point = if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) {
PointGrantLog(
memberId = memberId,
point = if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) {
order.can order.can
} else { } else {
policy.pointAmount policy.pointAmount
}, }
if (point > 0) {
grantLogRepository.save(
PointGrantLog(
memberId = memberId,
point = point,
actionType = actionType, actionType = actionType,
policyId = policy.id!!, policyId = policy.id!!,
orderId = order?.id orderId = order?.id
@ -119,11 +122,7 @@ class UserActionService(
memberPointRepository.save( memberPointRepository.save(
MemberPoint( MemberPoint(
memberId = memberId, memberId = memberId,
point = if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) { point = point,
order.can
} else {
policy.pointAmount
},
actionType = actionType, actionType = actionType,
expiresAt = now.plusDays(3) expiresAt = now.plusDays(3)
) )
@ -132,15 +131,12 @@ class UserActionService(
if (pushTokenList.isNotEmpty()) { if (pushTokenList.isNotEmpty()) {
fcmService.sendPointGranted( fcmService.sendPointGranted(
pushTokenList, pushTokenList,
if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) { point
order.can
} else {
policy.pointAmount
}
) )
} }
} }
} }
}
} catch (e: Exception) { } catch (e: Exception) {
logger.warn("포인트 지급 또는 알림 실패: ${e.message}") logger.warn("포인트 지급 또는 알림 실패: ${e.message}")
} }