test #316

Merged
klaus merged 20 commits from test into main 2025-05-20 06:03:11 +00:00
1 changed files with 28 additions and 32 deletions
Showing only changes of commit 36b8e8169e - Show all commits

View File

@ -102,42 +102,38 @@ 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( order.can
memberId = memberId, } else {
point = if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) { policy.pointAmount
order.can }
} else {
policy.pointAmount
},
actionType = actionType,
policyId = policy.id!!,
orderId = order?.id
)
)
memberPointRepository.save( if (point > 0) {
MemberPoint( grantLogRepository.save(
memberId = memberId, PointGrantLog(
point = if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) { memberId = memberId,
order.can point = point,
} else { actionType = actionType,
policy.pointAmount policyId = policy.id!!,
}, orderId = order?.id
actionType = actionType, )
expiresAt = now.plusDays(3)
) )
)
if (pushTokenList.isNotEmpty()) { memberPointRepository.save(
fcmService.sendPointGranted( MemberPoint(
pushTokenList, memberId = memberId,
if (actionType == ActionType.ORDER_CONTENT_COMMENT && order != null) { point = point,
order.can actionType = actionType,
} else { expiresAt = now.plusDays(3)
policy.pointAmount )
}
) )
if (pushTokenList.isNotEmpty()) {
fcmService.sendPointGranted(
pushTokenList,
point
)
}
} }
} }
} }