Compare commits

..

No commits in common. "8c6c6814242d3b4b7869efcc0e0739acf7693e72" and "50bc9f4ff36379c8d3f1afd6eef0a29e2e13d6de" have entirely different histories.

2 changed files with 8 additions and 6 deletions

View File

@ -152,13 +152,15 @@ class MemberController(
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
val memberId = member.id!! val memberId = member.id!!
val marketingPid = service.updateMarketingInfo( val marketingPid = request.pid
val changedMarketingPid = service.updateMarketingInfo(
memberId = memberId, memberId = memberId,
adid = request.adid, adid = request.adid,
pid = request.pid pid = marketingPid
) )
if (!marketingPid.isNullOrBlank()) { if (changedMarketingPid) {
trackingService.saveTrackingHistory( trackingService.saveTrackingHistory(
pid = marketingPid, pid = marketingPid,
type = AdTrackingHistoryType.LOGIN, type = AdTrackingHistoryType.LOGIN,

View File

@ -719,7 +719,7 @@ class MemberService(
} }
@Transactional @Transactional
fun updateMarketingInfo(memberId: Long, adid: String, pid: String): String? { fun updateMarketingInfo(memberId: Long, adid: String, pid: String): Boolean {
val member = repository.findByIdOrNull(id = memberId) val member = repository.findByIdOrNull(id = memberId)
?: throw SodaException("로그인 정보를 확인해주세요.") ?: throw SodaException("로그인 정보를 확인해주세요.")
@ -731,9 +731,9 @@ class MemberService(
member.activePid = pid member.activePid = pid
member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1) member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
return pid return true
} }
return member.activePid return false
} }
} }