From ba9c71a4ecf765242788ae52019b615537cbea75 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 25 Mar 2025 18:57:24 +0900
Subject: [PATCH] =?UTF-8?q?marketing=20=EC=A0=95=EB=B3=B4=20=EC=97=85?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=8B=9C=20pid=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20=ED=95=AD=EC=83=81=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B8=B0=EB=A1=9D=20=EB=82=A8?=
 =?UTF-8?q?=EA=B8=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/co/vividnext/sodalive/member/MemberController.kt   | 8 +++-----
 .../kr/co/vividnext/sodalive/member/MemberService.kt      | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt
index 886c48a..04a5d1c 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt
@@ -152,15 +152,13 @@ class MemberController(
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
         val memberId = member.id!!
-        val marketingPid = request.pid
-
-        val changedMarketingPid = service.updateMarketingInfo(
+        val marketingPid = service.updateMarketingInfo(
             memberId = memberId,
             adid = request.adid,
-            pid = marketingPid
+            pid = request.pid
         )
 
-        if (changedMarketingPid) {
+        if (!marketingPid.isNullOrBlank()) {
             trackingService.saveTrackingHistory(
                 pid = marketingPid,
                 type = AdTrackingHistoryType.LOGIN,
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
index b9f7b19..5e7642f 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
@@ -719,7 +719,7 @@ class MemberService(
     }
 
     @Transactional
-    fun updateMarketingInfo(memberId: Long, adid: String, pid: String): Boolean {
+    fun updateMarketingInfo(memberId: Long, adid: String, pid: String): String? {
         val member = repository.findByIdOrNull(id = memberId)
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
@@ -731,9 +731,9 @@ class MemberService(
             member.activePid = pid
             member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
 
-            return true
+            return pid
         }
 
-        return false
+        return member.activePid
     }
 }
-- 
2.40.1