Merge pull request GoodSpace-Kr#138 from borntocode2/main

borntocode2 · web-flow · commit 53272cdabcdd · 2025-09-27T17:32:19.000+09:00
[modify] payment logic
diff --git a/src/main/kotlin/goodspace/teaming/payment/controller/PaymentController.kt b/src/main/kotlin/goodspace/teaming/payment/controller/PaymentController.kt
@@ -20,10 +20,10 @@ class PaymentController(
 ) {
 
     @GetMapping(value = ["/html"], produces = [MediaType.TEXT_HTML_VALUE])
-    fun showPaymentPage(@RequestParam amount: Long, principal: Principal, @RequestParam roomId: Long
+    fun showPaymentPage(@RequestParam amount: Long, principal: Principal, @RequestParam roomId: Long, @RequestParam platform: String
     ): String {
         val userId = principal.getUserId()
-        val userPayInfo = "$userId:$roomId"
+        val userPayInfo = "$userId:$roomId:$platform"
 
         return """<!DOCTYPE html>
                 <html lang="en">
@@ -57,7 +57,7 @@ class PaymentController(
     }
 
     @PostMapping("/request")
-    fun requestPayment(@RequestParam params: MultiValueMap<String, String>): ResponseEntity<HttpStatus> {
+    fun requestPayment(@RequestParam params: MultiValueMap<String, String>): ResponseEntity<Void> {
         val dto = PaymentVerifyRespondDto(
             authResultCode = params["authResultCode"]?.firstOrNull() ?: "",
             authResultMsg = params["authResultMsg"]?.firstOrNull() ?: "",
@@ -70,11 +70,6 @@ class PaymentController(
             signature = params["signature"]?.firstOrNull() ?: ""
         )
 
-        val paymentApproveRespondDto: PaymentApproveRespondDto = paymentService.requestApprove(dto)
-        paymentService.savePaymentResult(paymentApproveRespondDto.toEntity())
-
-
-
-        return paymentService.mapResultCodeToHttpStatus(paymentApproveRespondDto.resultCode)
+        return paymentService.requestApprove(dto)
     }
 }
diff --git a/src/main/kotlin/goodspace/teaming/payment/service/PaymentService.kt b/src/main/kotlin/goodspace/teaming/payment/service/PaymentService.kt
@@ -10,6 +10,7 @@ import goodspace.teaming.payment.domain.PaymentApproveRespond
 import goodspace.teaming.payment.dto.PaymentApproveRequestDto
 import goodspace.teaming.payment.dto.PaymentApproveRespondDto
 import goodspace.teaming.payment.dto.PaymentVerifyRespondDto
+import goodspace.teaming.payment.dto.toEntity
 import goodspace.teaming.payment.repository.PaymentRepository
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.http.HttpHeaders
@@ -27,17 +28,35 @@ class PaymentService(
     private val paymentRepository: PaymentRepository,
     private val userRoomRepository: UserRoomRepository
 ){
-    fun requestApprove(paymentVerifyRespondDto: PaymentVerifyRespondDto): PaymentApproveRespondDto {
+    @Transactional
+    fun requestApprove(paymentVerifyRespondDto: PaymentVerifyRespondDto): ResponseEntity<Void> {
         if (paymentVerifyRespondDto.authResultCode != "0000"){
             throw RuntimeException("카드사인증 인증 실패: ${paymentVerifyRespondDto.authResultCode} in requestApprove Service Layer")
         }
 
         val amount = paymentVerifyRespondDto.amount
-        val (userId, roomId) = paymentVerifyRespondDto.mallReserved.split(":")
-        return approvePayment(paymentVerifyRespondDto.tid, amount, userId, roomId)
+        val (userId, roomId, platform) = paymentVerifyRespondDto.mallReserved.split(":")
+
+        val paymentApproveRespondDto = approvePayment(paymentVerifyRespondDto.tid, amount, userId, roomId, platform)
+
+        val redirectUrl = when {
+            paymentApproveRespondDto.resultCode == "0000" && platform == "APP" -> "teaming://payment/success"
+            paymentApproveRespondDto.resultCode != "0000" && platform == "APP" -> "teaming://payment/fail"
+            paymentApproveRespondDto.resultCode == "0000" && platform == "WEB" -> "https://teaming-three.vercel.app/payment/success"
+            else -> "https://teaming-three.vercel.app/payment/fail"
+        }
+
+        if (paymentApproveRespondDto.resultCode == "0000") {
+            savePaymentResult(paymentApproveRespondDto.toEntity())
+        }
+
+        return ResponseEntity.status(HttpStatus.FOUND)
+            .header("Location", redirectUrl)
+            .build()
     }
 
-    fun approvePayment(tid: String, amount: String, userId: String, roomId: String): PaymentApproveRespondDto {
+    @Transactional
+    fun approvePayment(tid: String, amount: String, userId: String, roomId: String, platform: String): PaymentApproveRespondDto {
         val url = "${nicepayProperties.approveUrl}/$tid"
         val request = PaymentApproveRequestDto(
             amount = amount
@@ -57,6 +76,7 @@ class PaymentService(
         if (paymentApproveRespondDto.resultCode == "0000" || paymentApproveRespondDto.resultCode == "3001") {
             saveUserRoomInfo(userId, roomId)
         }
+
         return paymentApproveRespondDto
     }
 
