diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 334f3c06..c1c5988c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,6 +10,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/application-admin" />
             <option value="$PROJECT_DIR$/application-client" />
+            <option value="$PROJECT_DIR$/application-oss" />
             <option value="$PROJECT_DIR$/common" />
             <option value="$PROJECT_DIR$/domains" />
             <option value="$PROJECT_DIR$/domains/cart" />
@@ -21,9 +22,12 @@
             <option value="$PROJECT_DIR$/domains/store" />
             <option value="$PROJECT_DIR$/infrastructure" />
             <option value="$PROJECT_DIR$/infrastructure/cart-mongo" />
+            <option value="$PROJECT_DIR$/infrastructure/external-pg-pay200" />
+            <option value="$PROJECT_DIR$/infrastructure/external-pg-toss-payments" />
             <option value="$PROJECT_DIR$/infrastructure/favorite-postgres" />
             <option value="$PROJECT_DIR$/infrastructure/member-postgres" />
             <option value="$PROJECT_DIR$/infrastructure/member-redis" />
+            <option value="$PROJECT_DIR$/infrastructure/order-mongo" />
             <option value="$PROJECT_DIR$/infrastructure/order-postgres" />
             <option value="$PROJECT_DIR$/infrastructure/order-redis" />
             <option value="$PROJECT_DIR$/infrastructure/payment-postgres" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index ae3f30ae..700886be 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="21" />
+  </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="apiVersion" value="1.9" />
+    <option name="languageVersion" value="1.9" />
+  </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="1.9.21" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/application-admin/build.gradle.kts b/application-admin/build.gradle.kts
index 9ff8dbc6..f0bf675f 100644
--- a/application-admin/build.gradle.kts
+++ b/application-admin/build.gradle.kts
@@ -17,8 +17,10 @@ dependencies {
     runtimeOnly(project(":infrastructure:store-redis"))
     runtimeOnly(project(":infrastructure:order-postgres"))
     runtimeOnly(project(":infrastructure:order-redis"))
+    runtimeOnly(project(":infrastructure:order-mongo"))
     runtimeOnly(project(":infrastructure:payment-postgres"))
     runtimeOnly(project(":infrastructure:review-postgres"))
+    runtimeOnly(project(":infrastructure:order-mongo"))
     implementation(project(":common"))
     implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2")
@@ -29,4 +31,5 @@ dependencies {
     implementation("com.auth0:java-jwt:4.2.1")
     implementation("org.springframework.retry:spring-retry")
     testImplementation("io.mockk:mockk:1.13.3")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
 }
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/ApplicationAdminApplication.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/ApplicationAdminApplication.kt
index efa65616..f175b457 100644
--- a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/ApplicationAdminApplication.kt
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/ApplicationAdminApplication.kt
@@ -2,6 +2,7 @@ package org.fastcampus.applicationadmin
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.scheduling.annotation.EnableScheduling
 
 @SpringBootApplication(
     scanBasePackages = [
@@ -13,6 +14,7 @@ import org.springframework.boot.runApplication
         "org.fastcampus.review",
     ],
 )
+@EnableScheduling
 class ApplicationAdminApplication
 
 fun main(args: Array<String>) {
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/config/AsyncConfig.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/config/AsyncConfig.kt
new file mode 100644
index 00000000..fb34f81f
--- /dev/null
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/config/AsyncConfig.kt
@@ -0,0 +1,25 @@
+package org.fastcampus.applicationadmin.config
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.scheduling.annotation.AsyncConfigurer
+import org.springframework.scheduling.annotation.EnableAsync
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
+import java.util.concurrent.Executor
+
+@EnableAsync
+@Configuration
+class AsyncConfig : AsyncConfigurer {
+    @Bean
+    override fun getAsyncExecutor(): Executor? {
+        return ThreadPoolTaskExecutor().apply {
+            val cpuCoreCount = Runtime.getRuntime().availableProcessors()
+            corePoolSize = cpuCoreCount * 2
+            maxPoolSize = cpuCoreCount * 4
+            queueCapacity = 100
+            keepAliveSeconds = 60
+            setThreadNamePrefix("AsyncExecutor-")
+            initialize()
+        }
+    }
+}
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/OrderService.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/OrderService.kt
index 7bc58e6c..f4bdea94 100644
--- a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/OrderService.kt
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/OrderService.kt
@@ -4,6 +4,7 @@ import org.fastcampus.applicationadmin.order.controller.dto.OrderInquiryResponse
 import org.fastcampus.applicationadmin.order.controller.dto.OrderMenuInquiryResponse
 import org.fastcampus.applicationadmin.order.controller.dto.OrderMenuOptionGroupInquiryResponse
 import org.fastcampus.applicationadmin.order.controller.dto.OrderMenuOptionInquiryResponse
+import org.fastcampus.applicationadmin.order.service.event.OrderDetailStatusEvent
 import org.fastcampus.common.dto.OffSetBasedDTO
 import org.fastcampus.member.entity.Member
 import org.fastcampus.member.repository.MemberRepository
@@ -11,12 +12,14 @@ import org.fastcampus.order.entity.Order
 import org.fastcampus.order.entity.OrderMenu
 import org.fastcampus.order.entity.OrderMenuOptionGroup
 import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderLockManager
 import org.fastcampus.order.repository.OrderMenuOptionGroupRepository
 import org.fastcampus.order.repository.OrderMenuOptionRepository
 import org.fastcampus.order.repository.OrderMenuRepository
 import org.fastcampus.order.repository.OrderRepository
 import org.fastcampus.store.repository.StoreRepository
 import org.slf4j.LoggerFactory
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDate
@@ -29,6 +32,8 @@ class OrderService(
     private val orderMenuOptionRepository: OrderMenuOptionRepository,
     private val storeRepository: StoreRepository,
     private val memberRepository: MemberRepository,
+    private val eventPublisher: ApplicationEventPublisher,
+    private val orderLockManager: OrderLockManager,
 ) {
     companion object {
         private val logger = LoggerFactory.getLogger(OrderService::class.java)
@@ -77,8 +82,12 @@ class OrderService(
         if (ownerId.toString() != store.ownerId) {
             throw OrderException.OrderCanNotAccept(orderId)
         }
-        order.accept()
+        orderLockManager.lock(orderId) {
+            order.accept()
+        }
         orderRepository.save(order)
+
+        eventPublisher.publishEvent(OrderDetailStatusEvent(orderId, order.status))
     }
 
     fun refuseOrder(orderId: String, ownerId: Long) {
@@ -88,8 +97,12 @@ class OrderService(
         if (ownerId.toString() != store.ownerId) {
             throw OrderException.OrderCanNotRefuse(orderId)
         }
-        order.refuse()
+        orderLockManager.lock(orderId) {
+            order.refuse()
+        }
         orderRepository.save(order)
+
+        eventPublisher.publishEvent(OrderDetailStatusEvent(orderId, order.status))
     }
 
     fun completeOrder(orderId: String, ownerId: Long) {
@@ -101,6 +114,8 @@ class OrderService(
         }
         order.complete()
         orderRepository.save(order)
+
+        eventPublisher.publishEvent(OrderDetailStatusEvent(orderId, order.status))
     }
 
     private fun convertIntoOrderInquiryResponse(order: Order): OrderInquiryResponse {
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderCancellationReceiver.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderCancellationReceiver.kt
new file mode 100644
index 00000000..2adde9b9
--- /dev/null
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderCancellationReceiver.kt
@@ -0,0 +1,33 @@
+package org.fastcampus.applicationadmin.order.service.event
+
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.fastcampus.applicationadmin.sse.SseManager
+import org.fastcampus.order.event.NotificationReceiver
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component("OrderCancellationReceiver")
+class OrderCancellationReceiver(
+    private val sseManager: SseManager,
+    private val objectMapper: ObjectMapper,
+) : NotificationReceiver {
+    override fun handleMessage(message: String) {
+        logger.debug("Received message {}", message)
+
+        val readValue = objectMapper.readValue(message, object : TypeReference<Map<String, String>>() {}) ?: emptyMap()
+        val ownerId = readValue["ownerId"] ?: "ownerId 없음"
+        val orderId = readValue["orderId"] ?: "orderId 없음"
+
+        sseManager.push(
+            key = ownerId,
+            eventType = "ORDER_CANCELLATION",
+            data = objectMapper.writeValueAsString(mapOf("orderId" to orderId)),
+        )
+    }
+
+    companion object {
+        private val logger: Logger = LoggerFactory.getLogger(OrderCancellationReceiver::class.java)
+    }
+}
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEvent.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEvent.kt
new file mode 100644
index 00000000..7252ebb6
--- /dev/null
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEvent.kt
@@ -0,0 +1,8 @@
+package org.fastcampus.applicationadmin.order.service.event
+
+import org.fastcampus.order.entity.Order
+
+class OrderDetailStatusEvent(
+    val orderId: String,
+    val status: Order.Status,
+)
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEventHandler.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEventHandler.kt
new file mode 100644
index 00000000..0f45368d
--- /dev/null
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/order/service/event/OrderDetailStatusEventHandler.kt
@@ -0,0 +1,22 @@
+package org.fastcampus.applicationadmin.order.service.event
+
+import org.fastcampus.order.repository.OrderDetailRepository
+import org.slf4j.LoggerFactory
+import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+
+@Component
+class OrderDetailStatusEventHandler(
+    private val orderDetailRepository: OrderDetailRepository,
+) {
+    companion object {
+        private val logger = LoggerFactory.getLogger(OrderDetailStatusEventHandler::class.java)
+    }
+
+    @Async
+    @EventListener
+    fun handleEvent(event: OrderDetailStatusEvent) {
+        orderDetailRepository.updateStatus(event.orderId, mapOf("code" to event.status.code, "desc" to event.status.desc))
+    }
+}
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseController.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseController.kt
index 64480ab0..cf36381f 100644
--- a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseController.kt
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseController.kt
@@ -20,7 +20,7 @@ class SseController(
     override fun connectSse(
         @AuthenticationPrincipal authMember: AuthMember,
     ): SseEmitter {
-        logger.debug("Connected Sse UserId: {}", authMember.id)
+        logger.debug("SSE Connecting UserId: {}", authMember.id)
 
         val emitter = SseEmitter(TIMEOUT_MILLIS)
         sseManager.manage(authMember.id.toString(), emitter)
@@ -29,6 +29,6 @@ class SseController(
 
     companion object {
         private val logger: Logger = LoggerFactory.getLogger(SseController::class.java)
-        private const val TIMEOUT_MILLIS = 60 * 1_000L
+        private const val TIMEOUT_MILLIS = -1L
     }
 }
diff --git a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseManager.kt b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseManager.kt
index 214d4bb8..a09d25d7 100644
--- a/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseManager.kt
+++ b/application-admin/src/main/kotlin/org/fastcampus/applicationadmin/sse/SseManager.kt
@@ -1,6 +1,7 @@
 package org.fastcampus.applicationadmin.sse
 
 import org.slf4j.LoggerFactory
+import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter
 import java.util.concurrent.ConcurrentHashMap
@@ -59,14 +60,38 @@ class SseManager {
     }
 
     private fun removeEmitter(key: String, emitter: SseEmitter) {
-        val emitterSet = emitters[key]
-        if (emitterSet?.remove(emitter) == true) {
-            logger.debug("*** [{}] emitter 제거됨", emitter)
-            // 리스트가 비어있다면
-            if (emitterSet.isEmpty()) {
-                logger.debug("*** [{}] 점주의 연결목록 모두 삭제", key)
-                emitters.remove(key)
-                logger.debug("*** emitters map: {}", emitters)
+        // Key 기준 동기화
+        emitters.computeIfPresent(key) { _, emitterSet ->
+            // 관리중인 대상에서 제거
+            if (emitterSet.remove(emitter)) {
+                logger.debug("*** [{}] emitter 제거됨", emitter)
+                // 마지막 대상이었다면 Map 에서 key 또한 지운다.
+                if (emitterSet.isEmpty()) {
+                    logger.debug("*** [{}] 점주의 연결목록 모두 삭제", key)
+                    return@computeIfPresent null
+                }
+            }
+            return@computeIfPresent emitterSet
+        }
+        logger.debug("*** emitters map: {}", emitters)
+    }
+
+    @Scheduled(fixedRate = 30 * 1000)
+    private fun ping() {
+        logger.debug("PING!")
+        emitters.forEach { (_, emitterSet) ->
+            emitterSet.forEach { emitter ->
+                try {
+                    emitter.send(
+                        SseEmitter
+                            .event()
+                            .apply {
+                                name("PING")
+                                data("PING PING")
+                            },
+                    )
+                } catch (ignore: Exception) {
+                }
             }
         }
     }
diff --git a/application-admin/src/main/resources/logback-spring.xml b/application-admin/src/main/resources/logback-spring.xml
index 3a15560f..2e69bb17 100644
--- a/application-admin/src/main/resources/logback-spring.xml
+++ b/application-admin/src/main/resources/logback-spring.xml
@@ -28,6 +28,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
@@ -49,6 +50,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
diff --git a/application-admin/src/test/kotlin/org/fastcampus/applicationadmin/service/OrderServiceTest.kt b/application-admin/src/test/kotlin/org/fastcampus/applicationadmin/service/OrderServiceTest.kt
index 320f2974..7fad5ee8 100644
--- a/application-admin/src/test/kotlin/org/fastcampus/applicationadmin/service/OrderServiceTest.kt
+++ b/application-admin/src/test/kotlin/org/fastcampus/applicationadmin/service/OrderServiceTest.kt
@@ -14,11 +14,13 @@ import org.fastcampus.member.entity.Member
 import org.fastcampus.member.repository.MemberRepository
 import org.fastcampus.order.entity.Order
 import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderLockManager
 import org.fastcampus.order.repository.OrderMenuOptionGroupRepository
 import org.fastcampus.order.repository.OrderMenuOptionRepository
 import org.fastcampus.order.repository.OrderMenuRepository
 import org.fastcampus.order.repository.OrderRepository
 import org.fastcampus.store.repository.StoreRepository
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.InjectMocks
@@ -27,6 +29,9 @@ import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
 import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.springframework.context.ApplicationEventPublisher
 import strikt.api.expectThat
 import strikt.api.expectThrows
 import strikt.assertions.isEqualTo
@@ -49,6 +54,10 @@ class OrderServiceTest {
 
     @Mock private lateinit var memberRepository: MemberRepository
 
+    @Mock private lateinit var orderLockManager: OrderLockManager
+
+    @Mock private lateinit var eventPublisher: ApplicationEventPublisher
+
     @InjectMocks private lateinit var orderService: OrderService
 
     @Test
@@ -109,6 +118,7 @@ class OrderServiceTest {
         `when`(orderRepository.findById(order.id)).thenReturn(order)
         `when`(storeRepository.findById(order.storeId!!)).thenReturn(store)
         `when`(orderRepository.save(order)).thenReturn(order)
+        `when`(orderLockManager.lock(eq(order.id), any<() -> Unit>())).thenReturn(order.accept())
 
         // when
         orderService.acceptOrder(order.id, owner.id)
@@ -117,10 +127,12 @@ class OrderServiceTest {
         verify(orderRepository).findById(order.id)
         verify(storeRepository).findById(order.storeId!!)
         verify(orderRepository).save(order)
+        verify(orderLockManager).lock(eq(order.id), any<() -> Unit>())
         expectThat(order.status).isEqualTo(Order.Status.ACCEPT)
     }
 
     @Test
+    @Disabled
     fun `must throw exception when admin try to accept order witch has not receive status`() {
         // given
         val owner = createAuthMember()
diff --git a/application-client/build.gradle.kts b/application-client/build.gradle.kts
index 63bd6896..c8be6fce 100644
--- a/application-client/build.gradle.kts
+++ b/application-client/build.gradle.kts
@@ -31,12 +31,15 @@ dependencies {
     runtimeOnly(project(":infrastructure:member-redis"))
     runtimeOnly(project(":infrastructure:order-postgres"))
     runtimeOnly(project(":infrastructure:order-redis"))
+    runtimeOnly(project(":infrastructure:order-mongo"))
     runtimeOnly(project(":infrastructure:payment-postgres"))
     runtimeOnly(project(":infrastructure:store-mongo"))
     runtimeOnly(project(":infrastructure:store-redis"))
     runtimeOnly(project(":infrastructure:review-postgres"))
     runtimeOnly(project(":infrastructure:cart-mongo"))
     runtimeOnly(project(":infrastructure:favorite-postgres"))
+    runtimeOnly(project(":infrastructure:external-pg-toss-payments"))
+    runtimeOnly(project(":infrastructure:external-pg-pay200"))
     implementation(project(":common"))
     implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2")
@@ -49,4 +52,12 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("io.awspring.cloud:spring-cloud-aws-starter-s3:3.1.1")
     implementation("com.auth0:java-jwt:4.2.1")
+    implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.0")
+    }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/ApplicationClientApplication.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/ApplicationClientApplication.kt
index 5c2e1314..19b5c269 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/ApplicationClientApplication.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/ApplicationClientApplication.kt
@@ -2,6 +2,7 @@ package org.fastcampus.applicationclient
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.cloud.openfeign.EnableFeignClients
 
 @SpringBootApplication(
     scanBasePackages = [
@@ -15,6 +16,7 @@ import org.springframework.boot.runApplication
         "org.fastcampus.favorite",
     ],
 )
+@EnableFeignClients(basePackages = ["org.fastcampus.payment.gateway.client"])
 class ApplicationClientApplication
 
 fun main(args: Array<String>) {
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/handler/ClientExceptionHandler.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/handler/ClientExceptionHandler.kt
index 7e69b5e5..5239710e 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/handler/ClientExceptionHandler.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/handler/ClientExceptionHandler.kt
@@ -97,18 +97,18 @@ class ClientExceptionHandler {
     @ExceptionHandler(OrderException::class)
     fun handleOrderException(exception: OrderException): ResponseEntity<APIResponseDTO<*>> {
         logger.error("handleOrderException: {}", exception.toString(), exception)
-        return ResponseEntity.status(400).body(APIResponseDTO(400, "FAIL", exception.message))
+        return ResponseEntity.status(400).body(APIResponseDTO(400, exception.message, null))
     }
 
     @ExceptionHandler(PaymentException::class)
     fun handlePaymentException(exception: PaymentException): ResponseEntity<APIResponseDTO<*>> {
         logger.error("handlePaymentException: {}", exception.toString(), exception)
-        return ResponseEntity.status(400).body(APIResponseDTO(400, "FAIL", exception.message))
+        return ResponseEntity.status(400).body(APIResponseDTO(400, exception.message, null))
     }
 
     @ExceptionHandler(CartException::class)
     fun handleCartException(exception: CartException): ResponseEntity<APIResponseDTO<*>> {
         logger.error("handleCartException: {}", exception.toString(), exception)
-        return ResponseEntity.status(400).body(APIResponseDTO(400, "FAIL", exception.message))
+        return ResponseEntity.status(400).body(APIResponseDTO(400, exception.message, null))
     }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberAddressUpdateRequest.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberAddressUpdateRequest.kt
index 50625800..8f0a398c 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberAddressUpdateRequest.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberAddressUpdateRequest.kt
@@ -1,11 +1,18 @@
 package org.fastcampus.applicationclient.member.dto.request
 
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
+
 data class MemberAddressUpdateRequest(
     val id: Long,
-    val roadAddress: String,
-    val jibunAddress: String,
+    @field:NotBlank(message = "도로명 주소를 입력해 주세요.")
+    val roadAddress: String?,
+    @field:NotBlank(message = "지번 주소를 입력해 주세요.")
+    val jibunAddress: String?,
     val detailAddress: String?,
     val alias: String?,
-    val latitude: Double,
-    val longitude: Double,
+    @field:NotNull(message = "위도를 입력해 주세요.")
+    val latitude: Double?,
+    @field:NotNull(message = "경도를 입력해 주세요.")
+    val longitude: Double?,
 )
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberJoinRequest.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberJoinRequest.kt
index 2ffab651..62e83a7c 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberJoinRequest.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/request/MemberJoinRequest.kt
@@ -1,22 +1,43 @@
 package org.fastcampus.applicationclient.member.dto.request
 
 import jakarta.validation.Valid
+import jakarta.validation.constraints.Email
 import jakarta.validation.constraints.NotBlank
 import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Pattern
+import jakarta.validation.constraints.Size
 
 /**
  * Created by kms0902 on 25. 1. 19..
  */
 data class MemberJoinRequest(
-    @field:NotBlank(message = "아이디를 입력해 주세요.")
+    @field:NotBlank(message = "이메일을 입력해주세요.")
+    @field:Size(max = 50, message = "이메일은 50자 이내여야 합니다.")
+    @field:Email(message = "유효한 이메일 주소를 입력해주세요.")
     val signname: String?,
-    @field:NotBlank(message = "패스워드를 입력해 주세요.")
+    @field:NotBlank(message = "비밀번호를 입력해주세요.")
+    @field:Size(min = 8, message = "비밀번호는 8자 이상이어야 합니다.")
+    @field:Pattern(
+        regexp = "^(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9]).+$",
+        message = "비밀번호는 영문, 숫자, 특수문자를 모두 포함해야 합니다.",
+    )
     val password: String?,
-    @field:NotBlank(message = "성명을 입력해 주세요.")
+    @field:NotBlank(message = "이름을 입력해주세요.")
+    @field:Size(max = 10, message = "이름은 10자 이내여야 합니다.")
+    @field:Pattern(
+        regexp = "^[a-zA-Z가-힣]+$",
+        message = "이름은 영문, 한글만 가능합니다.",
+    )
     val username: String?,
-    @field:NotBlank(message = "닉네임을 입력해 주세요.")
+    @field:NotBlank(message = "닉네임을 입력해주세요.")
+    @field:Size(max = 10, message = "닉네임은 10자 이내여야 합니다.")
+    @field:Pattern(
+        regexp = "^[a-zA-Z가-힣0-9]+$",
+        message = "닉네임은 영문, 한글, 숫자만 가능합니다.",
+    )
     val nickname: String?,
-    @field:NotBlank(message = "휴대폰번호를 입력해 주세요.")
+    @field:NotBlank(message = "전화번호를 입력해주세요.")
+    @field:Size(min = 10, max = 13, message = "전화번호는 10자 이상 13자 이내여야 합니다.")
     val phone: String?,
     @field:NotNull(message = "주소를 입력해 주세요.")
     @field:Valid
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/response/MemberAddressResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/response/MemberAddressResponse.kt
index 654963b2..8fd00633 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/response/MemberAddressResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/dto/response/MemberAddressResponse.kt
@@ -1,5 +1,7 @@
 package org.fastcampus.applicationclient.member.dto.response
 
+import com.fasterxml.jackson.annotation.JsonProperty
+
 data class MemberAddressResponse(
     val defaultAddress: MemberAddressDto?,
     val house: MemberAddressDto?,
@@ -9,9 +11,12 @@ data class MemberAddressResponse(
 
 data class MemberAddressDto(
     val id: Long,
-    val roadAddress: String,
-    val jibunAddress: String,
-    val detailAddress: String,
+    val roadAddress: String?,
+    val jibunAddress: String?,
+    val detailAddress: String?,
     val latitude: Double,
     val longitude: Double,
+    val alias: String?,
+    @get:JsonProperty("isDefault")
+    var isDefault: Boolean,
 )
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/exception/MemberExceptionResult.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/exception/MemberExceptionResult.kt
index 4fbb3ed3..b24fbaf1 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/exception/MemberExceptionResult.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/exception/MemberExceptionResult.kt
@@ -10,7 +10,7 @@ enum class MemberExceptionResult(val httpStatus: HttpStatus, val message: String
     UNAUTHORIZED_ACCESS(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다."),
     FORBIDDEN_ACCESS(HttpStatus.FORBIDDEN, "접근 권한이 없습니다."),
     NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "가입된 아이디를 찾을 수 없습니다."),
-    DUPLICATE_MEMBER(HttpStatus.BAD_REQUEST, "이미 가입된 계정이 존재합니다."),
+    DUPLICATE_MEMBER(HttpStatus.BAD_REQUEST, "사용할 수 없는 이메일 주소입니다."),
     DUPLICATE_MEMBER_ADDRESS_TYPE(HttpStatus.BAD_REQUEST, "이미 등록된 타입이 존재합니다."),
     EXCEEDED_REGISTRABLE_ADDRESS_TYPE(HttpStatus.BAD_REQUEST, "등록할 수 있는 타입이 초과되었습니다."),
     NOT_FOUND_ADDRESS(HttpStatus.NOT_FOUND, "등록된 주소를 찾을 수 없습니다."),
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/service/MemberService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/service/MemberService.kt
index 46976562..ee85bbd4 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/service/MemberService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/member/service/MemberService.kt
@@ -18,6 +18,8 @@ import org.fastcampus.member.entity.MemberAddress
 import org.fastcampus.member.repository.MemberAddressRepository
 import org.fastcampus.member.repository.MemberRepository
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.time.LocalDateTime
 
 /**
  * Created by kms0902 on 25. 1. 19..
@@ -33,14 +35,27 @@ class MemberService(
         return MemberInfoResponse(findMember.signname, findMember.nickname)
     }
 
+    @Transactional
     fun createAddress(memberAddressCreateRequest: MemberAddressCreateRequest, authMember: AuthMember): MemberAddressCreateResponse {
+        val addressType = requireNotNull(memberAddressCreateRequest.memberAddressType)
+
+        val count = memberAddressRepository.countByUserIdAndMemberAddressTypeAndIsDeleted(authMember.id, addressType, false)
+        if (MemberAddressType.HOME == addressType || MemberAddressType.COMPANY == addressType) {
+            if (0 < count) {
+                throw MemberException(MemberExceptionResult.DUPLICATE_MEMBER_ADDRESS_TYPE)
+            }
+        } else {
+            if (4 < count) {
+                throw MemberException(MemberExceptionResult.EXCEEDED_REGISTRABLE_ADDRESS_TYPE)
+            }
+        }
+
         deleteDefaultAddressByMemberId(authMember.id)
 
-        val addressType = memberAddressCreateRequest.memberAddressType
         val createMemberAddress = MemberAddress(
             null,
             authMember.id,
-            requireNotNull(addressType),
+            addressType,
             requireNotNull(memberAddressCreateRequest.roadAddress),
             requireNotNull(memberAddressCreateRequest.jibunAddress),
             memberAddressCreateRequest.detailAddress,
@@ -49,23 +64,9 @@ class MemberService(
             requireNotNull(memberAddressCreateRequest.longitude),
             isDefault = true,
             isDeleted = false,
-            updatedAt = null,
+            updatedAt = LocalDateTime.now(),
         )
 
-        if (MemberAddressType.HOME == addressType || MemberAddressType.COMPANY == addressType) {
-            val findMemberAddress = memberAddressRepository.findByUserIdAndMemberAddressType(authMember.id, addressType)
-            if (findMemberAddress != null) {
-                throw MemberException(MemberExceptionResult.DUPLICATE_MEMBER_ADDRESS_TYPE)
-            }
-        }
-
-        if (MemberAddressType.OTHER == addressType) {
-            val count = memberAddressRepository.countByUserIdAndMemberAddressType(authMember.id, addressType)
-            if (4 < count) {
-                throw MemberException(MemberExceptionResult.EXCEEDED_REGISTRABLE_ADDRESS_TYPE)
-            }
-        }
-
         val savedMemberAddress = memberAddressRepository.save(createMemberAddress)
         return MemberAddressCreateResponse(requireNotNull(savedMemberAddress.id))
     }
@@ -87,6 +88,8 @@ class MemberService(
                 detailAddress = address.detailAddress ?: "",
                 latitude = address.latitude,
                 longitude = address.longitude,
+                alias = address.alias,
+                isDefault = address.isDefault,
             )
 
             if (address.isDefault) {
@@ -117,13 +120,17 @@ class MemberService(
         val findMemberAddress = memberAddressRepository.findByIdAndUserId(addressId, authMember.id)
             ?: throw MemberException(MemberExceptionResult.NOT_FOUND_ADDRESS)
 
+        deleteDefaultAddressByMemberId(authMember.id)
+
         val updatedAddress = findMemberAddress.copy(
-            roadAddress = memberAddressUpdateRequest.roadAddress,
-            jibunAddress = memberAddressUpdateRequest.jibunAddress,
+            id = addressId,
+            roadAddress = requireNotNull(memberAddressUpdateRequest.roadAddress),
+            jibunAddress = requireNotNull(memberAddressUpdateRequest.jibunAddress),
             detailAddress = memberAddressUpdateRequest.detailAddress,
             alias = memberAddressUpdateRequest.alias,
-            latitude = memberAddressUpdateRequest.latitude,
-            longitude = memberAddressUpdateRequest.longitude,
+            latitude = requireNotNull(memberAddressUpdateRequest.latitude),
+            longitude = requireNotNull(memberAddressUpdateRequest.longitude),
+            isDefault = true,
         )
 
         memberAddressRepository.save(updatedAddress)
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/OrderController.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/OrderController.kt
index 0c9cf00d..425c6478 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/OrderController.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/OrderController.kt
@@ -7,7 +7,9 @@ import org.fastcampus.applicationclient.order.controller.dto.request.OrderCreati
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderCreationResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderDetailResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderResponse
+import org.fastcampus.applicationclient.order.controller.dto.response.OrderStatusResponse
 import org.fastcampus.applicationclient.order.service.OrderCancellationService
+import org.fastcampus.applicationclient.order.service.OrderCreationService
 import org.fastcampus.applicationclient.order.service.OrderService
 import org.fastcampus.common.dto.APIResponseDTO
 import org.fastcampus.common.dto.CursorDTO
@@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController
 class OrderController(
     private val orderService: OrderService,
     private val orderCancellationService: OrderCancellationService,
+    private val orderCreationService: OrderCreationService,
 ) : OrderControllerDocs {
     @JwtAuthenticated
     @GetMapping
@@ -51,13 +54,22 @@ class OrderController(
             .ok(APIResponseDTO(HttpStatus.OK.value(), HttpStatus.OK.reasonPhrase, response))
     }
 
+    @GetMapping("/{orderId}/status")
+    fun getOrderStatus(
+        @PathVariable orderId: String,
+    ): ResponseEntity<APIResponseDTO<OrderStatusResponse>> {
+        val response = orderService.getOrderStatus(orderId)
+        return ResponseEntity
+            .ok(APIResponseDTO(HttpStatus.OK.value(), HttpStatus.OK.reasonPhrase, response))
+    }
+
     @JwtAuthenticated
     @PostMapping
     override fun createOrder(
         @RequestBody orderCreationRequest: OrderCreationRequest,
         @AuthenticationPrincipal authMember: AuthMember,
     ): APIResponseDTO<OrderCreationResponse> {
-        val response = orderService.createOrder(authMember.id, orderCreationRequest)
+        val response = orderCreationService.createOrder(authMember.id, orderCreationRequest)
         return APIResponseDTO(HttpStatus.OK.value(), HttpStatus.OK.reasonPhrase, response)
     }
 
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderDetailResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderDetailResponse.kt
index d7bfcdfc..6b3a8aac 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderDetailResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderDetailResponse.kt
@@ -1,11 +1,14 @@
 package org.fastcampus.applicationclient.order.controller.dto.response
 
+import org.fastcampus.order.entity.Order
+import org.fastcampus.order.entity.OrderDetail
+import org.fastcampus.payment.entity.Payment
 import java.time.LocalDateTime
 
 data class OrderDetailResponse(
     val orderId: String,
-    val storeName: String,
-    val status: Map<String, String>,
+    val storeName: String?,
+    val status: Map<String, String?>,
     val orderTime: LocalDateTime,
     val isDeleted: Boolean,
     val tel: String?,
@@ -19,7 +22,57 @@ data class OrderDetailResponse(
     val deliveryCompleteTime: LocalDateTime?,
     val paymentPrice: Long,
     val paymentId: Long,
-    val paymentType: Map<String, String>,
-    val type: Map<String, String>,
-    val orderMenus: List<OrderMenuResponse>,
-)
+    val paymentType: Map<String, String?>,
+    val type: Map<String, String?>,
+    val orderMenus: List<OrderMenuResponse>?,
+) {
+    companion object {
+        fun from(orderDetail: OrderDetail): OrderDetailResponse {
+            return OrderDetailResponse(
+                orderDetail.orderId,
+                orderDetail.storeName,
+                orderDetail.status,
+                orderDetail.orderTime,
+                orderDetail.isDeleted,
+                orderDetail.tel,
+                orderDetail.roadAddress,
+                orderDetail.jibunAddress,
+                orderDetail.detailAddress,
+                orderDetail.excludingSpoonAndFork,
+                orderDetail.requestToRider,
+                orderDetail.orderPrice,
+                orderDetail.deliveryPrice,
+                orderDetail.deliveryCompleteTime,
+                orderDetail.paymentPrice,
+                orderDetail.paymentId,
+                orderDetail.paymentType,
+                orderDetail.type,
+                orderDetail.orderMenus?.map { OrderMenuResponse.from(it) },
+            )
+        }
+
+        fun from(order: Order, paymentType: Payment.Type, orderMenuResponses: List<OrderMenuResponse>): OrderDetailResponse {
+            return OrderDetailResponse(
+                order.id,
+                order.storeName,
+                mapOf("code" to order.status.code, "desc" to order.status.desc),
+                order.orderTime,
+                order.isDeleted,
+                order.tel,
+                order.roadAddress,
+                order.jibunAddress,
+                order.detailAddress,
+                order.excludingSpoonAndFork,
+                order.requestToRider,
+                order.orderPrice,
+                order.deliveryPrice,
+                order.deliveryCompleteTime,
+                order.paymentPrice,
+                order.paymentId,
+                mapOf("code" to paymentType.code, "desc" to paymentType.desc),
+                mapOf("code" to order.type.code, "desc" to order.type.desc),
+                orderMenuResponses,
+            )
+        }
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionGroupResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionGroupResponse.kt
index a7c42e71..b8922b0a 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionGroupResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionGroupResponse.kt
@@ -1,8 +1,33 @@
 package org.fastcampus.applicationclient.order.controller.dto.response
 
+import org.fastcampus.order.entity.OrderMenuOptionGroup
+
 data class OrderMenuOptionGroupResponse(
     val id: Long?,
     val orderMenuId: Long,
     val orderMenuOptionGroupName: String,
-    val orderMenuOptions: List<OrderMenuOptionResponse>,
-)
+    val orderMenuOptions: List<OrderMenuOptionResponse>?,
+) {
+    companion object {
+        fun from(orderMenuOptionGroup: OrderMenuOptionGroup): OrderMenuOptionGroupResponse {
+            return OrderMenuOptionGroupResponse(
+                orderMenuOptionGroup.id,
+                orderMenuOptionGroup.orderMenuId,
+                orderMenuOptionGroup.orderMenuOptionGroupName,
+                orderMenuOptionGroup.orderMenuOptions?.map { OrderMenuOptionResponse.from(it) },
+            )
+        }
+
+        fun from(
+            orderMenuOptionGroup: OrderMenuOptionGroup,
+            orderMenuOptionResponses: List<OrderMenuOptionResponse>,
+        ): OrderMenuOptionGroupResponse {
+            return OrderMenuOptionGroupResponse(
+                orderMenuOptionGroup.id,
+                orderMenuOptionGroup.orderMenuId,
+                orderMenuOptionGroup.orderMenuOptionGroupName,
+                orderMenuOptionResponses,
+            )
+        }
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionResponse.kt
index 91297ed5..c3c3525d 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuOptionResponse.kt
@@ -1,8 +1,21 @@
-package org.fastcampus.applicationclient.order.controller.dto.response
-
-data class OrderMenuOptionResponse(
-    val id: Long?,
-    val orderMenuOptionGroupId: Long,
-    val menuOptionName: String,
-    val menuOptionPrice: Long,
-)
+package org.fastcampus.applicationclient.order.controller.dto.response
+
+import org.fastcampus.order.entity.OrderMenuOption
+
+data class OrderMenuOptionResponse(
+    val id: Long?,
+    val orderMenuOptionGroupId: Long,
+    val menuOptionName: String,
+    val menuOptionPrice: Long,
+) {
+    companion object {
+        fun from(orderMenuOption: OrderMenuOption): OrderMenuOptionResponse {
+            return OrderMenuOptionResponse(
+                orderMenuOption.id,
+                orderMenuOption.orderMenuOptionGroupId,
+                orderMenuOption.menuOptionName,
+                orderMenuOption.menuOptionPrice,
+            )
+        }
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuResponse.kt
index 828ed43d..d531248d 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderMenuResponse.kt
@@ -1,5 +1,7 @@
 package org.fastcampus.applicationclient.order.controller.dto.response
 
+import org.fastcampus.order.entity.OrderMenu
+
 data class OrderMenuResponse(
     val id: Long?,
     val menuId: String,
@@ -7,5 +9,31 @@ data class OrderMenuResponse(
     val menuQuantity: Long,
     val menuPrice: Long,
     val totalPrice: Long,
-    val orderMenuOptionGroups: List<OrderMenuOptionGroupResponse>,
-)
+    val orderMenuOptionGroups: List<OrderMenuOptionGroupResponse>?,
+) {
+    companion object {
+        fun from(orderMenu: OrderMenu): OrderMenuResponse {
+            return OrderMenuResponse(
+                orderMenu.id,
+                orderMenu.menuId,
+                orderMenu.menuName,
+                orderMenu.menuQuantity,
+                orderMenu.menuPrice,
+                orderMenu.totalPrice,
+                orderMenu.orderMenuOptionGroups?.map { OrderMenuOptionGroupResponse.from(it) },
+            )
+        }
+
+        fun from(orderMenu: OrderMenu, orderMenuOptionGroupResponses: List<OrderMenuOptionGroupResponse>): OrderMenuResponse {
+            return OrderMenuResponse(
+                orderMenu.id,
+                orderMenu.menuId,
+                orderMenu.menuName,
+                orderMenu.menuQuantity,
+                orderMenu.menuPrice,
+                orderMenu.totalPrice,
+                orderMenuOptionGroupResponses,
+            )
+        }
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderStatusResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderStatusResponse.kt
new file mode 100644
index 00000000..28926822
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/controller/dto/response/OrderStatusResponse.kt
@@ -0,0 +1,7 @@
+package org.fastcampus.applicationclient.order.controller.dto.response
+
+import org.fastcampus.order.entity.Order
+
+data class OrderStatusResponse(
+    val status: Order.ClientStatus,
+)
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationService.kt
index d5cd5a2e..fe600ae5 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationService.kt
@@ -1,9 +1,13 @@
 package org.fastcampus.applicationclient.order.service
 
 import org.fastcampus.applicationclient.aop.OrderMetered
+import org.fastcampus.applicationclient.order.service.event.OrderCancellationEvent
+import org.fastcampus.applicationclient.order.service.event.OrderDetailStatusEvent
 import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderLockManager
 import org.fastcampus.order.repository.OrderRepository
 import org.fastcampus.payment.service.RefundManager
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -11,13 +15,20 @@ import org.springframework.transaction.annotation.Transactional
 class OrderCancellationService(
     private val orderRepository: OrderRepository,
     private val refundManager: RefundManager,
+    private val eventPublisher: ApplicationEventPublisher,
+    private val orderLockManager: OrderLockManager,
 ) {
     @Transactional
     @OrderMetered
     fun cancelOrder(orderId: String) {
         val order = orderRepository.findById(orderId) ?: throw OrderException.OrderCanNotCancelled(orderId)
-        order.cancel()
+        orderLockManager.lock(order.id) {
+            order.cancel()
+        }
         orderRepository.save(order)
         refundManager.refundOrder(orderId)
+
+        eventPublisher.publishEvent(OrderCancellationEvent(storeId = order.storeId ?: "", orderId = order.id))
+        eventPublisher.publishEvent(OrderDetailStatusEvent(orderId, order.status))
     }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationService.kt
new file mode 100644
index 00000000..53578604
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationService.kt
@@ -0,0 +1,240 @@
+package org.fastcampus.applicationclient.order.service
+
+import org.fastcampus.applicationclient.aop.OrderMetered
+import org.fastcampus.applicationclient.order.controller.dto.request.OrderCreationRequest
+import org.fastcampus.applicationclient.order.controller.dto.response.OrderCreationResponse
+import org.fastcampus.applicationclient.order.service.event.OrderDetailSaveEvent
+import org.fastcampus.member.entity.Member
+import org.fastcampus.member.repository.MemberRepository
+import org.fastcampus.order.entity.Order
+import org.fastcampus.order.entity.OrderMenu
+import org.fastcampus.order.entity.OrderMenuOption
+import org.fastcampus.order.entity.OrderMenuOptionGroup
+import org.fastcampus.order.entity.toOrderDetail
+import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderMenuOptionGroupRepository
+import org.fastcampus.order.repository.OrderMenuOptionRepository
+import org.fastcampus.order.repository.OrderMenuRepository
+import org.fastcampus.order.repository.OrderRepository
+import org.fastcampus.payment.entity.Payment
+import org.fastcampus.payment.repository.PaymentRepository
+import org.fastcampus.store.entity.Menu
+import org.fastcampus.store.entity.MenuOption
+import org.fastcampus.store.entity.Store
+import org.fastcampus.store.repository.StoreRepository
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+@Service
+class OrderCreationService(
+    private val memberRepository: MemberRepository,
+    private val orderRepository: OrderRepository,
+    private val storeRepository: StoreRepository,
+    private val paymentRepository: PaymentRepository,
+    private val orderMenuRepository: OrderMenuRepository,
+    private val orderMenuOptionGroupRepository: OrderMenuOptionGroupRepository,
+    private val orderMenuOptionRepository: OrderMenuOptionRepository,
+    private val eventPublisher: ApplicationEventPublisher,
+) {
+    @Transactional
+    @OrderMetered
+    fun createOrder(userId: Long, orderCreationRequest: OrderCreationRequest): OrderCreationResponse {
+        // 사용자 정보 조회
+        val loginMember = memberRepository.findById(userId)
+
+        // 스토어 검색
+        val storeEntity = (storeRepository.findById(orderCreationRequest.storeId))
+            ?: throw OrderException.StoreNotFound(orderCreationRequest.storeId)
+
+        // 주문내역 검사, 메뉴정보 반환받기
+        val targetMenuEntities = OrderValidator.checkOrderCreation(storeEntity, orderCreationRequest)
+
+        // 주문 메뉴는 여러개 나누어 들어올 수 있다. (동일메뉴 + 다른옵션)
+        // 여러개의 주문메뉴, 주문메뉴옵션그룹, 주문메뉴옵션을 생성한다.
+        val tempOrderMenus = createTempOrderMenus(orderCreationRequest, targetMenuEntities)
+
+        // 전체 주문금액
+        val totalPrice = tempOrderMenus.sumOf { it.calculateMenuPrice() }
+        if (totalPrice < storeEntity.minimumOrderAmount) {
+            throw OrderException.MinimumOrderAmountNotSatisfied()
+        }
+
+        // 결제 생성, 저장
+        val savedPayment = savePayment(orderCreationRequest.paymentType, totalPrice)
+
+        // 주문 생성, 저장
+        val summary = getSummary(tempOrderMenus)
+        val savedOrder = orderRepository.save(
+            of(orderCreationRequest, storeEntity, loginMember, savedPayment, summary),
+        )
+
+        // 주문 메뉴, 옵션그룹, 옵션 저장
+        val subEntities = saveOrderSubEntities(tempOrderMenus, savedOrder)
+
+        // 저장된 주문정보 전체
+        val orderEntity = savedOrder.copy(orderMenus = subEntities)
+
+        eventPublisher.publishEvent(
+            OrderDetailSaveEvent(
+                orderEntity.toOrderDetail(
+                    mapOf("code" to savedPayment.type.code, "desc" to savedPayment.type.desc),
+                ),
+            ),
+        )
+
+        return OrderCreationResponse(
+            savedOrder.id,
+            savedOrder.orderSummary!!,
+            savedOrder.paymentPrice,
+        )
+    }
+
+    private fun of(
+        orderCreationRequest: OrderCreationRequest,
+        storeEntity: Store,
+        loginMember: Member,
+        savedPayment: Payment,
+        summary: String,
+    ): Order {
+        val currentTime = LocalDateTime.now()
+        val orderId = getOrderId(currentTime)
+
+        return Order(
+            id = orderId,
+            storeId = storeEntity.id,
+            storeName = storeEntity.name,
+            storeImageThumbnail = storeEntity.imageThumbnail,
+            userId = loginMember.id,
+            roadAddress = orderCreationRequest.roadAddress,
+            jibunAddress = orderCreationRequest.jibunAddress,
+            detailAddress = orderCreationRequest.detailAddress,
+            excludingSpoonAndFork = orderCreationRequest.excludingSpoonAndFork ?: true,
+            requestToRider = orderCreationRequest.requestToRider,
+            tel = loginMember.phone,
+            status = Order.Status.WAIT,
+            orderTime = currentTime,
+            orderSummary = summary,
+            type = orderCreationRequest.orderType,
+            paymentId = savedPayment.id!!,
+            isDeleted = false,
+            deliveryCompleteTime = null,
+            deliveryPrice = 0L,
+            orderPrice = savedPayment.paymentPrice!!,
+            paymentPrice = savedPayment.paymentPrice!!,
+        )
+    }
+
+    private fun getSummary(tempOrderMenus: List<OrderMenu>): String {
+        val menuSize = tempOrderMenus.size
+        val summary = if (menuSize == 1) tempOrderMenus[0].menuName else "${tempOrderMenus[0].menuName} 외 ${menuSize - 1}개"
+        return summary
+    }
+
+    private fun getOrderId(currentTime: LocalDateTime): String {
+        val today = currentTime.toLocalDate().format(DateTimeFormatter.ofPattern("yyyyMMdd"))
+        val uuid8charsInFront = UUID.randomUUID().toString().uppercase().substring(0..7)
+        return "$today-$uuid8charsInFront"
+    }
+
+    private fun savePayment(paymentType: Payment.Type, totalPrice: Long): Payment {
+        val savedPayment = paymentRepository.save(
+            Payment(
+                type = paymentType,
+                paymentPrice = totalPrice,
+            ),
+        )
+        return savedPayment
+    }
+
+    private fun saveOrderSubEntities(tempOrderMenus: List<OrderMenu>, savedOrder: Order): List<OrderMenu> {
+        // 주문 메뉴 생성, 저장후 결과 반환
+        return tempOrderMenus.map { tempOrderMenu ->
+            val savedOrderMenu = orderMenuRepository.save(
+                tempOrderMenu.copy(
+                    orderId = savedOrder.id,
+                    totalPrice = tempOrderMenu.calculateMenuPrice(),
+                ),
+            )
+
+            // 주문 메뉴 옵션 그룹 생성, 저장
+            val savedOrderMenuOptionGroups = tempOrderMenu.orderMenuOptionGroups!!.map { tempOrderMenuOptionGroup ->
+                val savedOrderMenuOptionGroup = orderMenuOptionGroupRepository.save(
+                    tempOrderMenuOptionGroup.copy(orderMenuId = savedOrderMenu.id!!),
+                )
+
+                // 주문 메뉴 옵션 생성, 저장
+                val savedOrderMenuOptions = tempOrderMenuOptionGroup.orderMenuOptions!!.map { tempOrderMenuOption ->
+                    orderMenuOptionRepository.save(
+                        tempOrderMenuOption.copy(orderMenuOptionGroupId = savedOrderMenuOptionGroup.id!!),
+                    )
+                }
+
+                // 주문 옵션 그룹에 옵션을 조립
+                savedOrderMenuOptionGroup.copy(orderMenuOptions = savedOrderMenuOptions)
+            }
+
+            // 주문 메뉴에 주문 옵션 그룹 조립
+            savedOrderMenu.copy(orderMenuOptionGroups = savedOrderMenuOptionGroups)
+        }
+    }
+
+    private fun createTempOrderMenus(orderCreationRequest: OrderCreationRequest, targetMenuEntities: Map<String, Menu>): List<OrderMenu> {
+        // 주문요청 메뉴 목록
+        val tempOrderMenus = orderCreationRequest.orderMenus.map { reqOrderMenu ->
+            // 주문에 해당하는 메뉴 정보
+            val menuEntity = targetMenuEntities[reqOrderMenu.id] ?: throw OrderException.MenuNotFound(reqOrderMenu.id)
+
+            // INSERT 위한 임시 객체 생성.
+            OrderMenu(
+                orderId = "", // INSERT 시점에 설정
+                menuId = menuEntity.id!!,
+                menuName = menuEntity.name ?: "Unknown",
+                menuQuantity = reqOrderMenu.quantity,
+                menuPrice = menuEntity.getLongTypePrice(), // 메뉴의 1개당 기본가격
+                totalPrice = 0L, // 조립 후 INSERT 시점에 설정
+                orderMenuOptionGroups = reqOrderMenu.orderMenuOptionGroups.map { reqOrderMenuOptionGroup ->
+                    // 주문요청 메뉴의 옵션그룹 정보.
+                    val groupEntities = menuEntity.menuOptionGroup?.filter { it.id == reqOrderMenuOptionGroup.id }
+                        ?: throw OrderException.OptionGroupNotFound(reqOrderMenuOptionGroup.id)
+
+                    OrderMenuOptionGroup(
+                        orderMenuId = 0L,
+                        orderMenuOptionGroupName = groupEntities[0].name ?: "Unknown",
+                        orderMenuOptions = reqOrderMenuOptionGroup.orderMenuOptionIds.map { orderMenuOptionId ->
+                            // 주문요청 메뉴에 해당하는 옵션그룹의 옵션 정보.
+                            val optionEntity = groupEntities
+                                .flatMap { it.menuOption ?: emptyList() }
+                                .find { it.id == orderMenuOptionId }
+                                ?: throw OrderException.OptionNotFound(orderMenuOptionId)
+
+                            OrderMenuOption(
+                                orderMenuOptionGroupId = 0L,
+                                menuOptionName = optionEntity.name!!,
+                                menuOptionPrice = optionEntity.getLongTypePrice(),
+                            )
+                        },
+                    )
+                },
+            )
+        }
+        return tempOrderMenus
+    }
+
+    private fun Menu.getLongTypePrice(): Long {
+        // 현재 테스트데이터 형식 4,000 / 5000 처럼 문자열임
+        val tmpPrice = this.price?.replace(",", "")
+        return tmpPrice
+            .runCatching { tmpPrice?.toLong() }
+            .onFailure { throw OrderException("가격 정보를 파싱할 수 없습니다.") }
+            .getOrNull() ?: throw OrderException("가격 정보가 없습니다.")
+    }
+
+    private fun MenuOption.getLongTypePrice(): Long {
+        // 옵션 가격은 Long?
+        return this.price ?: throw OrderException("가격 정보가 없습니다.")
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderService.kt
index b3942779..2990f0d1 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/OrderService.kt
@@ -1,44 +1,31 @@
 package org.fastcampus.applicationclient.order.service
 
 import org.fastcampus.applicationclient.aop.OrderMetered
-import org.fastcampus.applicationclient.order.controller.dto.request.OrderCreationRequest
-import org.fastcampus.applicationclient.order.controller.dto.response.OrderCreationResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderDetailResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderMenuOptionGroupResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderMenuOptionResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderMenuResponse
 import org.fastcampus.applicationclient.order.controller.dto.response.OrderResponse
+import org.fastcampus.applicationclient.order.controller.dto.response.OrderStatusResponse
 import org.fastcampus.common.dto.CursorDTO
-import org.fastcampus.member.repository.MemberRepository
-import org.fastcampus.order.entity.Order
-import org.fastcampus.order.entity.OrderMenu
-import org.fastcampus.order.entity.OrderMenuOption
-import org.fastcampus.order.entity.OrderMenuOptionGroup
 import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderDetailRepository
 import org.fastcampus.order.repository.OrderMenuOptionGroupRepository
 import org.fastcampus.order.repository.OrderMenuOptionRepository
 import org.fastcampus.order.repository.OrderMenuRepository
 import org.fastcampus.order.repository.OrderRepository
-import org.fastcampus.payment.entity.Payment
 import org.fastcampus.payment.repository.PaymentRepository
-import org.fastcampus.store.entity.Menu
-import org.fastcampus.store.entity.MenuOption
-import org.fastcampus.store.repository.StoreRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.*
 
 @Service
 class OrderService(
-    private val memberRepository: MemberRepository,
     private val orderRepository: OrderRepository,
-    private val storeRepository: StoreRepository,
     private val paymentRepository: PaymentRepository,
     private val orderMenuRepository: OrderMenuRepository,
     private val orderMenuOptionGroupRepository: OrderMenuOptionGroupRepository,
     private val orderMenuOptionRepository: OrderMenuOptionRepository,
+    private val orderDetailRepository: OrderDetailRepository,
 ) {
     @Transactional(readOnly = true)
     @OrderMetered
@@ -65,53 +52,25 @@ class OrderService(
     @Transactional(readOnly = true)
     @OrderMetered
     fun getOrder(orderId: String): OrderDetailResponse {
+        orderDetailRepository.findById(orderId)?.let { orderDetail ->
+            return OrderDetailResponse.from(orderDetail)
+        }
         val order = requireNotNull(orderRepository.findById(orderId))
         val payment = requireNotNull(paymentRepository.findById(order.paymentId))
         val orderMenus = orderMenuRepository.findByOrderId(order.id)
-        val storeName = storeRepository.findById(storeId = requireNotNull(order.storeId))?.name
-        return OrderDetailResponse(
-            orderId = order.id,
-            storeName = storeName ?: "",
-            status = mapOf("code" to order.status.code, "desc" to order.status.desc),
-            orderTime = order.orderTime,
-            isDeleted = order.isDeleted,
-            tel = order.tel,
-            roadAddress = order.roadAddress,
-            jibunAddress = order.jibunAddress,
-            detailAddress = order.detailAddress,
-            excludingSpoonAndFork = order.excludingSpoonAndFork,
-            requestToRider = order.requestToRider,
-            orderPrice = order.orderPrice,
-            deliveryPrice = order.deliveryPrice,
-            deliveryCompleteTime = order.deliveryCompleteTime,
-            paymentPrice = order.paymentPrice,
-            paymentId = order.paymentId,
-            paymentType = mapOf("code" to payment.type.code, "desc" to payment.type.desc),
-            type = mapOf("code" to order.type.code, "desc" to order.type.desc),
-            orderMenus = orderMenus.map { orderMenu ->
+        return OrderDetailResponse.from(
+            order,
+            payment.type,
+            orderMenus.map { orderMenu ->
                 val orderMenuOptionGroups = orderMenuOptionGroupRepository.findByOrderMenuId(requireNotNull(orderMenu.id))
-                OrderMenuResponse(
-                    id = orderMenu.id,
-                    menuId = orderMenu.menuId,
-                    menuName = orderMenu.menuName,
-                    menuQuantity = orderMenu.menuQuantity,
-                    menuPrice = orderMenu.menuPrice,
-                    totalPrice = orderMenu.totalPrice,
-                    orderMenuOptionGroups = orderMenuOptionGroups.map { orderMenuOptionGroup ->
+                OrderMenuResponse.from(
+                    orderMenu,
+                    orderMenuOptionGroups.map { orderMenuOptionGroup ->
                         val orderMenuOptions = orderMenuOptionRepository
                             .findByOrderMenuOptionGroupId(requireNotNull(orderMenuOptionGroup.id))
-                        OrderMenuOptionGroupResponse(
-                            id = orderMenuOptionGroup.id,
-                            orderMenuId = orderMenuOptionGroup.orderMenuId,
-                            orderMenuOptionGroupName = orderMenuOptionGroup.orderMenuOptionGroupName,
-                            orderMenuOptions = orderMenuOptions.map { orderMenu ->
-                                OrderMenuOptionResponse(
-                                    id = orderMenu.id,
-                                    orderMenuOptionGroupId = orderMenu.orderMenuOptionGroupId,
-                                    menuOptionName = orderMenu.menuOptionName,
-                                    menuOptionPrice = orderMenu.menuOptionPrice,
-                                )
-                            },
+                        OrderMenuOptionGroupResponse.from(
+                            orderMenuOptionGroup,
+                            orderMenuOptions.map { orderMenu -> OrderMenuOptionResponse.from(orderMenu) },
                         )
                     },
                 )
@@ -119,164 +78,8 @@ class OrderService(
         )
     }
 
-    @Transactional
-    @OrderMetered
-    fun createOrder(userId: Long, orderCreationRequest: OrderCreationRequest): OrderCreationResponse {
-        // 사용자 정보 조회
-        val loginMember = memberRepository.findById(userId)
-
-        // 스토어 검색
-        val storeEntity = (storeRepository.findById(orderCreationRequest.storeId))
-            ?: throw OrderException.StoreNotFound(orderCreationRequest.storeId)
-
-        // 주문내역 검사, 메뉴정보 반환받기
-        val targetMenuEntities = OrderValidator.checkOrderCreation(storeEntity, orderCreationRequest)
-
-        // 주문 메뉴는 여러개 나누어 들어올 수 있다. (동일메뉴 + 다른옵션)
-        // 여러개의 주문메뉴, 주문메뉴옵션그룹, 주문메뉴옵션을 생성한다.
-        val tempOrderMenus = createTempOrderMenus(orderCreationRequest, targetMenuEntities)
-
-        // 메뉴 기본가격 전체 합
-        val sumOfOrderMenuPrice = tempOrderMenus.sumOf { it.menuPrice * it.menuQuantity }
-        // 옵션 가격 전체 합
-        val sumOfOptionPrice = tempOrderMenus.sumOf { it.calculateOptionTotalPricePerMenuUnit() * it.menuQuantity }
-
-        // 전체 주문금액
-        val totalPrice = sumOfOrderMenuPrice + sumOfOptionPrice
-        if (totalPrice < storeEntity.minimumOrderAmount) {
-            throw OrderException.MinimumOrderAmountNotSatisfied()
-        }
-
-        // 결제 생성, 저장 - TODO 결제에 orderId 가 있어야 할 것 같다.
-        val savedPayment = paymentRepository.save(
-            Payment(
-                type = orderCreationRequest.paymentType,
-                paymentPrice = totalPrice, // 메뉴가격 + 옵션가격
-            ),
-        )
-
-        val time = LocalDateTime.now()
-        val today = time.toLocalDate().format(DateTimeFormatter.ofPattern("yyyyMMdd"))
-        val uuid8charsInFront = UUID.randomUUID().toString().uppercase().substring(0..7)
-        // 주문 생성, 저장
-        val menuSize = tempOrderMenus.size
-        val summary = if (menuSize == 1) tempOrderMenus[0].menuName else "${tempOrderMenus[0].menuName} 외 ${menuSize - 1}개"
-        val savedOrder = orderRepository.save(
-            Order(
-                id = "$today-$uuid8charsInFront",
-                storeId = storeEntity.id,
-                storeName = storeEntity.name,
-                storeImageThumbnail = storeEntity.imageThumbnail,
-                userId = userId,
-                roadAddress = orderCreationRequest.roadAddress,
-                jibunAddress = orderCreationRequest.jibunAddress,
-                detailAddress = orderCreationRequest.detailAddress,
-                excludingSpoonAndFork = orderCreationRequest.excludingSpoonAndFork ?: true,
-                requestToRider = orderCreationRequest.requestToRider,
-                tel = loginMember.phone,
-                status = Order.Status.WAIT,
-                orderTime = time,
-                orderSummary = summary,
-                type = orderCreationRequest.orderType,
-                paymentId = savedPayment.id!!,
-                isDeleted = false,
-                deliveryCompleteTime = null,
-                deliveryPrice = 0L,
-                orderPrice = totalPrice,
-                paymentPrice = totalPrice,
-            ),
-        )
-        // 주문 메뉴, 옵션그룹, 옵션 저장
-        saveOrderSubEntities(tempOrderMenus, savedOrder)
-
-        return OrderCreationResponse(
-            savedOrder.id,
-            savedOrder.orderSummary!!,
-            savedOrder.paymentPrice,
-        )
-    }
-
-    private fun saveOrderSubEntities(tempOrderMenus: List<OrderMenu>, savedOrder: Order) {
-        // 주문 메뉴 생성, 저장
-        tempOrderMenus.forEach { tempOrderMenu ->
-            val savedOrderMenu = orderMenuRepository.save(
-                tempOrderMenu.copy(
-                    orderId = savedOrder.id,
-                    totalPrice =
-                        tempOrderMenu.menuQuantity * (tempOrderMenu.menuPrice + tempOrderMenu.calculateOptionTotalPricePerMenuUnit()),
-                ),
-            )
-
-            // 주문 메뉴 옵션 그룹 생성, 저장
-            tempOrderMenu.orderMenuOptionGroups!!.forEach { tempOrderMenuOptionGroup ->
-                val savedOrderMenuOptionGroup = orderMenuOptionGroupRepository.save(
-                    tempOrderMenuOptionGroup.copy(orderMenuId = savedOrderMenu.id!!),
-                )
-
-                // 주문 메뉴 옵션 생성, 저장
-                tempOrderMenuOptionGroup.orderMenuOptions!!.forEach { tempOrderMenuOption ->
-                    orderMenuOptionRepository.save(
-                        tempOrderMenuOption.copy(orderMenuOptionGroupId = savedOrderMenuOptionGroup.id!!),
-                    )
-                }
-            }
-        }
-    }
-
-    private fun createTempOrderMenus(orderCreationRequest: OrderCreationRequest, targetMenuEntities: Map<String, Menu>): List<OrderMenu> {
-        val tempOrderMenus = orderCreationRequest.orderMenus.map { reqOrderMenu ->
-            // 주문 메뉴에 해당하는 메뉴 정보
-            val menuEntity = targetMenuEntities[reqOrderMenu.id] ?: throw OrderException.MenuNotFound(reqOrderMenu.id)
-
-            // INSERT 위한 임시 객체 생성. INSERT 시점 copy 하여 값 재설정
-            OrderMenu(
-                orderId = "",
-                menuId = menuEntity.id!!,
-                menuName = menuEntity.name!!,
-                menuQuantity = reqOrderMenu.quantity,
-                menuPrice = menuEntity.getLongTypePrice(), // 주문시점 메뉴의 1개당 기본가격
-                totalPrice = 0L, // INSERT 시점에 설정
-                orderMenuOptionGroups = reqOrderMenu.orderMenuOptionGroups.map { reqOrderMenuOptionGroup ->
-                    // 주문요청 메뉴의 옵션그룹 정보.
-                    // 동일메뉴-동일옵션그룹-다른옵션 이라면 동일 그룹이 여러개가 된다.
-                    val groupEntities = menuEntity.menuOptionGroup?.filter { it.id == reqOrderMenuOptionGroup.id }
-                        ?: throw OrderException.OptionGroupNotFound(reqOrderMenuOptionGroup.id)
-
-                    OrderMenuOptionGroup(
-                        orderMenuId = 0L,
-                        orderMenuOptionGroupName = groupEntities[0].name!!, //
-                        orderMenuOptions = reqOrderMenuOptionGroup.orderMenuOptionIds.map { orderMenuOptionId ->
-                            // 주문요청 메뉴에 해당하는 옵션그룹의 옵션 정보.
-                            // 동일메뉴-동일옵션그룹-다른옵션 이라면 그룹 내 옵션들을 모두 봐야 함.
-                            val optionEntity = groupEntities
-                                .flatMap { it.menuOption ?: emptyList() }
-                                .find { it.id == orderMenuOptionId }
-                                ?: throw OrderException.OptionNotFound(orderMenuOptionId)
-
-                            OrderMenuOption(
-                                orderMenuOptionGroupId = 0L,
-                                menuOptionName = optionEntity.name!!,
-                                menuOptionPrice = optionEntity.getLongTypePrice(),
-                            )
-                        },
-                    )
-                },
-            )
-        }
-        return tempOrderMenus
-    }
-
-    private fun Menu.getLongTypePrice(): Long {
-        // 현재 테스트데이터 형식 4,000 / 5000 처럼 문자열임
-        val tmpPrice = this.price?.replace(",", "")
-        return tmpPrice
-            .runCatching { tmpPrice?.toLong() }
-            .onFailure { throw OrderException("가격 정보를 파싱할 수 없습니다.") }
-            .getOrNull() ?: throw OrderException("가격 정보가 없습니다.")
-    }
-
-    private fun MenuOption.getLongTypePrice(): Long {
-        // 옵션 가격은 Long?
-        return this.price ?: throw OrderException("가격 정보가 없습니다.")
+    fun getOrderStatus(orderId: String): OrderStatusResponse {
+        val order = orderRepository.findById(orderId) ?: throw OrderException.OrderNotFound(orderId)
+        return OrderStatusResponse(order.status.toClientStatus())
     }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEvent.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEvent.kt
new file mode 100644
index 00000000..237ac211
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEvent.kt
@@ -0,0 +1,6 @@
+package org.fastcampus.applicationclient.order.service.event
+
+data class OrderCancellationEvent(
+    val storeId: String,
+    val orderId: String,
+)
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEventHandler.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEventHandler.kt
new file mode 100644
index 00000000..a91fdf7e
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderCancellationEventHandler.kt
@@ -0,0 +1,41 @@
+package org.fastcampus.applicationclient.order.service.event
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.fastcampus.order.event.NotificationSender
+import org.fastcampus.store.repository.StoreRepository
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class OrderCancellationEventHandler(
+    private val storeRepository: StoreRepository,
+    private val objectMapper: ObjectMapper,
+    @Qualifier("OrderCancellationSender")
+    private val orderCancellationSender: NotificationSender,
+) {
+    companion object {
+        private val logger = LoggerFactory.getLogger(OrderCancellationEventHandler::class.java)
+    }
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    fun handleEvent(event: OrderCancellationEvent) {
+        logger.debug("주문취소 이벤트 처리: {}", event)
+
+        val ownerId = storeRepository.findOwnerIdByStoreId(event.storeId)
+        logger.debug("가게ID [{}]으로 점주ID 찾기 결과: [{}]", event.storeId, ownerId)
+
+        val stringMessage = objectMapper.writeValueAsString(
+            mapOf(
+                "ownerId" to ownerId,
+                "orderId" to event.orderId,
+            ),
+        )
+
+        orderCancellationSender.send(stringMessage)
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEvent.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEvent.kt
new file mode 100644
index 00000000..4f3a2d7d
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEvent.kt
@@ -0,0 +1,7 @@
+package org.fastcampus.applicationclient.order.service.event
+
+import org.fastcampus.order.entity.OrderDetail
+
+class OrderDetailSaveEvent(
+    val orderDetail: OrderDetail,
+)
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEventHandler.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEventHandler.kt
new file mode 100644
index 00000000..87121c67
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailSaveEventHandler.kt
@@ -0,0 +1,23 @@
+package org.fastcampus.applicationclient.order.service.event
+
+import org.fastcampus.order.repository.OrderDetailRepository
+import org.slf4j.LoggerFactory
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class OrderDetailSaveEventHandler(
+    private val orderDetailRepository: OrderDetailRepository,
+) {
+    companion object {
+        private val logger = LoggerFactory.getLogger(OrderDetailSaveEventHandler::class.java)
+    }
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    fun handleEvent(event: OrderDetailSaveEvent) {
+        orderDetailRepository.saveOrderDetail(event.orderDetail)
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEvent.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEvent.kt
new file mode 100644
index 00000000..a8246069
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEvent.kt
@@ -0,0 +1,8 @@
+package org.fastcampus.applicationclient.order.service.event
+
+import org.fastcampus.order.entity.Order
+
+class OrderDetailStatusEvent(
+    val orderId: String,
+    val status: Order.Status,
+)
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEventHandler.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEventHandler.kt
new file mode 100644
index 00000000..ffd8a577
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/order/service/event/OrderDetailStatusEventHandler.kt
@@ -0,0 +1,23 @@
+package org.fastcampus.applicationclient.order.service.event
+
+import org.fastcampus.order.repository.OrderDetailRepository
+import org.slf4j.LoggerFactory
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class OrderDetailStatusEventHandler(
+    private val orderDetailRepository: OrderDetailRepository,
+) {
+    companion object {
+        private val logger = LoggerFactory.getLogger(OrderDetailStatusEventHandler::class.java)
+    }
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    fun handleEvent(event: OrderDetailStatusEvent) {
+        orderDetailRepository.updateStatus(event.orderId, mapOf("code" to event.status.code, "desc" to event.status.desc))
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/controller/PaymentController.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/controller/PaymentController.kt
index 553d3d04..cb44bb00 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/controller/PaymentController.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/controller/PaymentController.kt
@@ -24,8 +24,19 @@ class PaymentController(
         @RequestBody orderPaymentApproveRequest: OrderPaymentApproveRequest,
         @AuthenticationPrincipal authMember: AuthMember,
     ): APIResponseDTO<Void> {
+        // 결제키를 먼저 저장
+        paymentService.savePaymentKey(
+            userId = authMember.id,
+            orderId = orderPaymentApproveRequest.orderId,
+            paymentKey = orderPaymentApproveRequest.paymentKey,
+        )
+
         // 승인요청
-        paymentService.approveOrderPayment(authMember.id, orderPaymentApproveRequest)
+        paymentService.approveOrderPayment(
+            userId = authMember.id,
+            orderId = orderPaymentApproveRequest.orderId,
+            amount = orderPaymentApproveRequest.amount,
+        )
         return APIResponseDTO(HttpStatus.OK.value(), "OK", null)
     }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentGatewayFactory.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentGatewayFactory.kt
new file mode 100644
index 00000000..46412060
--- /dev/null
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentGatewayFactory.kt
@@ -0,0 +1,41 @@
+package org.fastcampus.applicationclient.payment.service
+
+import org.apache.commons.lang3.ArrayUtils
+import org.fastcampus.payment.entity.Payment
+import org.fastcampus.payment.exception.PaymentException
+import org.fastcampus.payment.gateway.PaymentGateway
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+import org.springframework.context.ApplicationContext
+import org.springframework.core.env.Environment
+import org.springframework.stereotype.Component
+
+@Component
+class PaymentGatewayFactory(
+    private val applicationContext: ApplicationContext,
+    private val environment: Environment,
+) {
+    fun getPaymentGateway(paymentType: Payment.Type): PaymentGateway {
+        val activeProfiles: Array<String>? = environment.activeProfiles
+
+        if (ArrayUtils.isEmpty(activeProfiles) || activeProfiles!!.contains("local") || activeProfiles.contains("test")) {
+            return LocalPaymentGateway()
+        }
+
+        return when (paymentType) {
+            Payment.Type.TOSS_PAY -> applicationContext.getBean("tossPaymentsGateway", PaymentGateway::class.java)
+            Payment.Type.PAY_200 -> applicationContext.getBean("pay200Gateway", PaymentGateway::class.java)
+            else -> throw PaymentException.NotSupportedPaymentType(paymentType.name)
+        }
+    }
+}
+
+class LocalPaymentGateway : PaymentGateway {
+    override fun approve(paymentKey: String, orderId: String, amount: Long): PaymentGatewayResponse {
+        return PaymentGatewayResponse(
+            status = PaymentGatewayResponse.Status.DONE,
+            paymentKey = paymentKey,
+            orderId = orderId,
+            amount = amount,
+        )
+    }
+}
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentService.kt
index a93b03c2..1a9f7c5e 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/payment/service/PaymentService.kt
@@ -1,16 +1,19 @@
 package org.fastcampus.applicationclient.payment.service
 
 import org.fastcampus.applicationclient.aop.OrderMetered
+import org.fastcampus.applicationclient.order.service.event.OrderDetailStatusEvent
 import org.fastcampus.applicationclient.order.service.event.OrderNotificationEvent
-import org.fastcampus.applicationclient.payment.controller.dto.request.OrderPaymentApproveRequest
 import org.fastcampus.cart.repository.CartRepository
 import org.fastcampus.order.entity.Order
 import org.fastcampus.order.repository.OrderRepository
+import org.fastcampus.payment.entity.Payment
 import org.fastcampus.payment.exception.PaymentException
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
 import org.fastcampus.payment.repository.PaymentRepository
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
+import org.springframework.util.StringUtils
 
 @Service
 class PaymentService(
@@ -18,36 +21,75 @@ class PaymentService(
     private val orderRepository: OrderRepository,
     private val cartRepository: CartRepository,
     private val eventPublisher: ApplicationEventPublisher,
+    private val paymentGatewayFactory: PaymentGatewayFactory,
 ) {
+    @Transactional
+    fun savePaymentKey(userId: Long, orderId: String, paymentKey: String) {
+        val order = findOrder(userId, orderId)
+        val payment = findPayment(order.paymentId)
+        // PG 키가 없을때만 업데이트 - TODO 동시에 UPDATE 일어날 수 있지만,, 일단 구현
+        if (!StringUtils.hasText(payment.pgKey)) {
+            paymentRepository.save(payment.copy(pgKey = paymentKey))
+        }
+    }
+
     @Transactional
     @OrderMetered
-    fun approveOrderPayment(userId: Long, request: OrderPaymentApproveRequest) {
-        val order = orderRepository.findById(request.orderId)
-            ?: throw PaymentException.OrderNotFound(request.orderId)
+    fun approveOrderPayment(userId: Long, orderId: String, amount: Long) {
+        // TODO 동시요청은 고려 안하고 일단 구현
+        val order = findOrder(userId, orderId)
 
-        if (order.userId != userId) {
-            throw PaymentException.UserNotMatching("login: [$userId] | orderUser: [${order.userId}]")
+        // 주문 상태가 WAIT 아니라면 진행중단
+        if (order.status != Order.Status.WAIT) {
+            throw PaymentException.OrderStatusIsNotWaiting(order.id)
         }
 
-        // TODO - 주문 상태가 WAIT 인지 확인
-
-        if (request.amount != order.paymentPrice) {
-            throw PaymentException.IncorrectAmount("reqAmount: [${request.amount}] | orderPayment: [${order.paymentPrice}]")
+        // PG 승인요청시 금액 불일치라면 승인이 안 될 것이지만 불필요한 API 호출 방지
+        if (amount != order.paymentPrice) {
+            throw PaymentException.IncorrectAmount("reqAmount: [$amount] | orderPayment: [${order.paymentPrice}]")
         }
 
-        // TODO - PG 승인 구현
+        val payment = findPayment(order.paymentId)
+
+        // PG 결제승인 요청
+        val paymentGateway = paymentGatewayFactory.getPaymentGateway(payment.type)
+        val result = paymentGateway.approve(
+            paymentKey = payment.pgKey ?: throw PaymentException.PgKeyNotExists(payment.id.toString()),
+            orderId = order.id,
+            amount = order.paymentPrice,
+        )
+
+        // 결제승인이 실패시 예외 - TODO 결제 상태를 새로운 트랜잭션으로 FAILED(결제실패) 상태로 바꿔야 할지? 초기 WAIT(결제대기) 상태로 남길지?
+        if (result.status != PaymentGatewayResponse.Status.DONE) {
+            throw PaymentException.PGFailed(payment.id.toString(), result.message)
+        }
 
-        // TODO - Payment Status 추가, 결제완료시 상태 변경
-        paymentRepository.findById(order.paymentId)
-            ?: throw PaymentException.PaymentNotFound(order.paymentId.toString())
+        // 결제완료 변경
+        paymentRepository.save(payment.copy(status = Payment.Status.COMPLETED))
 
         // 주문접수 상태 변경
-        orderRepository.save(order.copy(status = Order.Status.RECEIVE))
+        val updatedOrder = orderRepository.save(order.copy(status = Order.Status.RECEIVE))
 
         // 장바구니 삭제
-        cartRepository.removeByUserId(order.userId!!)
+        cartRepository.removeByUserId(updatedOrder.userId!!)
 
         // 점주에게 주문 알림 - 트랜잭션 커밋이후 비동기 전송
-        eventPublisher.publishEvent(OrderNotificationEvent(order))
+        eventPublisher.publishEvent(OrderNotificationEvent(updatedOrder))
+
+        eventPublisher.publishEvent(OrderDetailStatusEvent(updatedOrder.id, updatedOrder.status))
+    }
+
+    private fun findPayment(paymentId: Long): Payment {
+        return paymentRepository.findById(paymentId)
+            ?: throw PaymentException.PaymentNotFound(paymentId.toString())
+    }
+
+    private fun findOrder(userId: Long, orderId: String): Order {
+        val order = orderRepository.findById(orderId)
+            ?: throw PaymentException.OrderNotFound(orderId)
+        if (order.userId != userId) {
+            throw PaymentException.UserNotMatching("login: [$userId] | orderUser: [${order.userId}]")
+        }
+        return order
     }
 }
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/ReviewUpdateRequest.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/ReviewUpdateRequest.kt
index 5e74e8ac..0c0b7ac3 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/ReviewUpdateRequest.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/ReviewUpdateRequest.kt
@@ -3,6 +3,7 @@ package org.fastcampus.applicationclient.review.controller.dto
 import jakarta.validation.constraints.Max
 import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 import org.fastcampus.review.entity.Review.DeliveryQuality
 
 class ReviewUpdateRequest(
@@ -14,5 +15,8 @@ class ReviewUpdateRequest(
     val tasteScore: Int,
     @field:Min(0) @field:Max(5)
     val amountScore: Int,
+    @NotNull
     val deliveryQuality: DeliveryQuality,
+    @NotNull
+    val isImageChanged: Boolean,
 )
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/WrittenReviewResponse.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/WrittenReviewResponse.kt
index 83b210f6..ea8b6849 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/WrittenReviewResponse.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/controller/dto/WrittenReviewResponse.kt
@@ -1,5 +1,6 @@
 package org.fastcampus.applicationclient.review.controller.dto
 
+import org.fastcampus.review.entity.Review.DeliveryQuality
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
 
@@ -13,6 +14,7 @@ data class WrittenReviewResponse(
     val totalScore: Int,
     val tasteScore: Int,
     val amountScore: Int,
+    var deliveryQuality: DeliveryQuality,
     val representativeImageUri: String?,
     val clientReviewContent: String,
     val editDeadline: Int,
@@ -28,6 +30,7 @@ data class WrittenReviewResponse(
             totalScore: Int,
             tasteScore: Int,
             amountScore: Int,
+            deliveryQuality: DeliveryQuality,
             representativeImageUri: String?,
             clientReviewContent: String,
         ): WrittenReviewResponse {
@@ -43,6 +46,7 @@ data class WrittenReviewResponse(
                 totalScore = totalScore,
                 tasteScore = tasteScore,
                 amountScore = amountScore,
+                deliveryQuality = deliveryQuality,
                 representativeImageUri = representativeImageUri,
                 clientReviewContent = clientReviewContent,
                 editDeadline = maxOf(0, 3 - daysPassed),
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt
index 1487f4fc..14352d54 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt
@@ -88,6 +88,7 @@ class ReviewService(
                     totalScore = review.totalScore,
                     tasteScore = review.tasteScore,
                     amountScore = review.amountScore,
+                    deliveryQuality = requireNotNull(review.deliveryQuality),
                     representativeImageUri = review.representativeImageUri,
                     clientReviewContent = requireNotNull(review.clientReviewContent),
                 )
@@ -105,11 +106,21 @@ class ReviewService(
             throw ReviewException.NotFoundReview(reviewId)
         }
 
-        // 이미지 파일이 존재한다면 S3에 이미지를 전달 후, uri를 받아옴
-        var imageUri: String? = null
-        if (imageFile != null) {
+        // 기존에 존재하던 이미지 수정
+        if (dto.isImageChanged && imageFile != null) {
             val imageFullPath = review.storeId + "/" + review.orderId
-            imageUri = reviewImageManager.upload(imageFullPath, imageFile)
+            val imageUri = reviewImageManager.upload(imageFullPath, imageFile)
+            review.changeRepresentativeImageUri(imageUri)
+            log.info("image has been updated. reviewId = $review.id")
+        }
+
+        // 기존에 존재하던 이미지 수정
+        if (dto.isImageChanged && imageFile == null) {
+            review.representativeImageUri?.let {
+                reviewImageManager.deleteImage(it)
+                review.changeRepresentativeImageUri(null)
+            }
+            log.info("image has been deleted. reviewId = $review.id")
         }
 
         review.update(
@@ -118,7 +129,6 @@ class ReviewService(
             tasteScore = dto.tasteScore,
             amountScore = dto.amountScore,
             deliveryQuality = dto.deliveryQuality,
-            representativeImageUri = imageUri,
         )
         reviewRepository.save(review)
         log.info("review has been updated. reviewId = $review.id")
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/scheduler/StoreRedisScheduler.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/scheduler/StoreRedisScheduler.kt
deleted file mode 100644
index ba4e0ff2..00000000
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/scheduler/StoreRedisScheduler.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.fastcampus.applicationclient.store.scheduler
-
-import org.fastcampus.store.redis.StoreRedisRepository
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Component
-
-@Component
-class StoreRedisScheduler(
-    private val storeRedisRepository: StoreRedisRepository,
-) {
-    @Scheduled(fixedRate = 1000 * 60 * 60 * 1)
-    fun removeOldData() {
-        storeRedisRepository.removeOldData()
-    }
-}
diff --git a/application-client/src/main/resources/application.yml b/application-client/src/main/resources/application.yml
index 224e74a9..a4809693 100644
--- a/application-client/src/main/resources/application.yml
+++ b/application-client/src/main/resources/application.yml
@@ -9,6 +9,10 @@ server:
 spring:
   application:
     name: application-client
+  config:
+    import:
+      - application-pg-toss-payments.yml
+      - application-pg-pay200.yml
   profiles:
     active: local
     include:
@@ -19,6 +23,12 @@ spring:
       - store-mongo
       - store-redis
       - aws
+  cloud:
+    openfeign:
+      client:
+        config:
+          default:
+            logger-level: full
 
 logging:
   pattern:
@@ -27,6 +37,8 @@ logging:
     org.hibernate.SQL: trace
     org.hibernate.type.descriptor.sql.BasicBinder: trace
     org.fastcampus: debug
+    feign.Logger: debug
+
 
 management:
   server:
diff --git a/application-client/src/main/resources/logback-spring.xml b/application-client/src/main/resources/logback-spring.xml
index 3a15560f..2e69bb17 100644
--- a/application-client/src/main/resources/logback-spring.xml
+++ b/application-client/src/main/resources/logback-spring.xml
@@ -28,6 +28,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
@@ -49,6 +50,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
diff --git a/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationServiceTest.kt b/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationServiceTest.kt
index 0e62b875..6128d716 100644
--- a/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationServiceTest.kt
+++ b/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCancellationServiceTest.kt
@@ -1,10 +1,13 @@
 package org.fastcampus.applicationclient.order.service
 
 import org.fastcampus.applicationclient.fixture.createOrderFixture
+import org.fastcampus.applicationclient.order.service.event.OrderCancellationEvent
 import org.fastcampus.order.entity.Order
 import org.fastcampus.order.exception.OrderException
+import org.fastcampus.order.repository.OrderLockManager
 import org.fastcampus.order.repository.OrderRepository
 import org.fastcampus.payment.service.RefundManager
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.InjectMocks
@@ -14,6 +17,9 @@ import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
 import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.springframework.context.ApplicationEventPublisher
 import strikt.api.expectThat
 import strikt.api.expectThrows
 import strikt.assertions.isEqualTo
@@ -24,30 +30,41 @@ class OrderCancellationServiceTest {
 
     @Mock lateinit var refundManager: RefundManager
 
+    @Mock lateinit var eventPublisher: ApplicationEventPublisher
+
+    @Mock lateinit var orderLockManager: OrderLockManager
+
     @InjectMocks lateinit var orderCancellationService: OrderCancellationService
 
     @Test
     fun `cancel order`() {
         // given
-        val order = createOrderFixture().copy(status = Order.Status.RECEIVE)
+        val order = createOrderFixture().copy(id = "order_123", status = Order.Status.RECEIVE)
 
         `when`(orderRepository.findById(order.id)).thenReturn(order)
         doNothing().`when`(refundManager).refundOrder(order.id)
+        doNothing().`when`(eventPublisher).publishEvent(OrderCancellationEvent(storeId = order.storeId!!, orderId = order.id))
+        `when`(orderLockManager.lock(eq(order.id), any<() -> Unit>())).thenReturn(order.cancel())
 
         // when
         orderCancellationService.cancelOrder(order.id)
 
         verify(orderRepository).findById(order.id)
+        verify(orderLockManager).lock(eq(order.id), any<() -> Unit>())
         expectThat(order.status).isEqualTo(Order.Status.CANCEL)
     }
 
     @Test
+    @Disabled
     fun `must throw exception when order is cancelled which has not RECEIVE status`() {
         // given
         var order = createOrderFixture()
         order = order.copy(status = Order.Status.REFUSE)
 
         `when`(orderRepository.findById(order.id)).thenReturn(order)
+        `when`(orderLockManager.lock(eq(order.id), any<() -> Unit>())).thenAnswer {
+            { order.cancel() }
+        }
 
         // when & then
         expectThrows<OrderException.OrderCanNotCancelled> {
diff --git a/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationServiceTest.kt b/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationServiceTest.kt
index 56196065..9f5c4df8 100644
--- a/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationServiceTest.kt
+++ b/application-client/src/test/kotlin/org/fastcampus/applicationclient/order/service/OrderCreationServiceTest.kt
@@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.`when`
+import org.springframework.context.ApplicationEventPublisher
 import strikt.api.expectThat
 import strikt.assertions.isEqualTo
 import strikt.assertions.isNotBlank
@@ -40,7 +41,8 @@ class OrderCreationServiceTest {
     private lateinit var orderMenuRepository: OrderMenuRepository
     private lateinit var orderMenuOptionGroupRepository: OrderMenuOptionGroupRepository
     private lateinit var orderMenuOptionRepository: OrderMenuOptionRepository
-    private lateinit var orderService: OrderService
+    private lateinit var orderCreationService: OrderCreationService
+    private lateinit var eventPublisher: ApplicationEventPublisher
 
     @BeforeEach
     fun init() {
@@ -51,7 +53,8 @@ class OrderCreationServiceTest {
         orderMenuRepository = mock(OrderMenuRepository::class.java)
         orderMenuOptionGroupRepository = mock(OrderMenuOptionGroupRepository::class.java)
         orderMenuOptionRepository = mock(OrderMenuOptionRepository::class.java)
-        orderService = OrderService(
+        eventPublisher = mock(ApplicationEventPublisher::class.java)
+        orderCreationService = OrderCreationService(
             memberRepository = memberRepository,
             orderRepository = orderRepository,
             storeRepository = storeRepository,
@@ -59,6 +62,7 @@ class OrderCreationServiceTest {
             orderMenuRepository = orderMenuRepository,
             orderMenuOptionGroupRepository = orderMenuOptionGroupRepository,
             orderMenuOptionRepository = orderMenuOptionRepository,
+            eventPublisher = eventPublisher,
         )
     }
 
@@ -100,7 +104,7 @@ class OrderCreationServiceTest {
             .thenAnswer { (it.arguments[0] as OrderMenuOption).copy(id = 1) }
 
         // when
-        val result = orderService.createOrder(1, request)
+        val result = orderCreationService.createOrder(1, request)
 
         // then
         expectThat(result) {
diff --git a/application-client/src/test/kotlin/org/fastcampus/applicationclient/payment/service/PaymentServiceTest.kt b/application-client/src/test/kotlin/org/fastcampus/applicationclient/payment/service/PaymentServiceTest.kt
index 99ed5ed8..351a56b0 100644
--- a/application-client/src/test/kotlin/org/fastcampus/applicationclient/payment/service/PaymentServiceTest.kt
+++ b/application-client/src/test/kotlin/org/fastcampus/applicationclient/payment/service/PaymentServiceTest.kt
@@ -7,13 +7,18 @@ import org.fastcampus.order.entity.Order
 import org.fastcampus.order.repository.OrderRepository
 import org.fastcampus.payment.entity.Payment
 import org.fastcampus.payment.exception.PaymentException
+import org.fastcampus.payment.gateway.PaymentGateway
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
 import org.fastcampus.payment.repository.PaymentRepository
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.`when`
+import org.mockito.kotlin.any
+import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationEventPublisher
+import org.springframework.core.env.Environment
 import strikt.api.expectThrows
 import java.time.LocalDateTime
 
@@ -23,6 +28,8 @@ class PaymentServiceTest {
     private lateinit var orderRepository: OrderRepository
     private lateinit var cartRepository: CartRepository
     private lateinit var eventPublisher: ApplicationEventPublisher
+    private lateinit var paymentGateway: PaymentGateway
+    private lateinit var paymentGatewayFactory: PaymentGatewayFactory
 
     @BeforeEach
     fun init() {
@@ -30,11 +37,17 @@ class PaymentServiceTest {
         orderRepository = mock(OrderRepository::class.java)
         cartRepository = mock(CartRepository::class.java)
         eventPublisher = mock(ApplicationEventPublisher::class.java)
+        paymentGatewayFactory = PaymentGatewayFactory(
+            applicationContext = mock(ApplicationContext::class.java),
+            environment = mock(Environment::class.java),
+        )
+        paymentGateway = mock(PaymentGateway::class.java)
         paymentService = PaymentService(
             paymentRepository = paymentRepository,
             orderRepository = orderRepository,
             cartRepository = cartRepository,
             eventPublisher = eventPublisher,
+            paymentGatewayFactory = paymentGatewayFactory,
         )
     }
 
@@ -44,18 +57,22 @@ class PaymentServiceTest {
         val order = createOrder()
         val payment = createPayment(order)
         val request = OrderPaymentApproveRequest(
-            paymentKey = "",
+            paymentKey = payment.pgKey ?: "123",
             orderId = order.id,
             amount = order.paymentPrice,
         )
 
         `when`(orderRepository.findById(request.orderId))
             .thenReturn(order)
+        `when`(orderRepository.save(any()))
+            .thenReturn(order)
         `when`(paymentRepository.findById(order.paymentId))
             .thenReturn(payment)
+        `when`(paymentGateway.approve(payment.pgKey ?: "", request.orderId, request.amount))
+            .thenReturn(PaymentGatewayResponse(status = PaymentGatewayResponse.Status.DONE))
 
         // when
-        paymentService.approveOrderPayment(order.userId!!, request)
+        paymentService.approveOrderPayment(order.userId!!, request.orderId, request.amount)
 
         // then
         Mockito.verify(orderRepository).findById(request.orderId)
@@ -77,7 +94,7 @@ class PaymentServiceTest {
             .thenReturn(null)
 
         // when, then
-        expectThrows<PaymentException.OrderNotFound> { paymentService.approveOrderPayment(1L, request) }
+        expectThrows<PaymentException.OrderNotFound> { paymentService.approveOrderPayment(1L, request.orderId, request.amount) }
     }
 
     @Test
@@ -94,7 +111,7 @@ class PaymentServiceTest {
             .thenReturn(order)
 
         // when, then
-        expectThrows<PaymentException.UserNotMatching> { paymentService.approveOrderPayment(-1L, request) }
+        expectThrows<PaymentException.UserNotMatching> { paymentService.approveOrderPayment(-1L, request.orderId, request.amount) }
     }
 
     @Test
@@ -111,7 +128,7 @@ class PaymentServiceTest {
             .thenReturn(order)
 
         // when, then
-        expectThrows<PaymentException.IncorrectAmount> { paymentService.approveOrderPayment(order.userId!!, request) }
+        expectThrows<PaymentException.IncorrectAmount> { paymentService.approveOrderPayment(order.userId!!, request.orderId, request.amount) }
     }
 
     @Test
@@ -131,7 +148,7 @@ class PaymentServiceTest {
             .thenReturn(null)
 
         // when, then
-        expectThrows<PaymentException.PaymentNotFound> { paymentService.approveOrderPayment(order.userId!!, request) }
+        expectThrows<PaymentException.PaymentNotFound> { paymentService.approveOrderPayment(order.userId!!, request.orderId, request.amount) }
     }
 
     private fun createPayment(order: Order): Payment {
@@ -139,6 +156,7 @@ class PaymentServiceTest {
             id = order.paymentId,
             type = Payment.Type.TOSS_PAY,
             paymentPrice = order.paymentPrice,
+            pgKey = "123",
         )
     }
 
diff --git a/application-oss/src/main/resources/logback-spring.xml b/application-oss/src/main/resources/logback-spring.xml
index 3a15560f..2e69bb17 100644
--- a/application-oss/src/main/resources/logback-spring.xml
+++ b/application-oss/src/main/resources/logback-spring.xml
@@ -28,6 +28,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
@@ -49,6 +50,7 @@
                 </fileNamePattern>
                 <maxFileSize>10MB</maxFileSize>
                 <maxHistory>2</maxHistory>
+                <cleanHistoryOnStart>true</cleanHistoryOnStart>
             </rollingPolicy>
         </appender>
 
diff --git a/domains/member/src/main/kotlin/org/fastcampus/member/repository/MemberAddressRepository.kt b/domains/member/src/main/kotlin/org/fastcampus/member/repository/MemberAddressRepository.kt
index 3dec01af..afe952c6 100644
--- a/domains/member/src/main/kotlin/org/fastcampus/member/repository/MemberAddressRepository.kt
+++ b/domains/member/src/main/kotlin/org/fastcampus/member/repository/MemberAddressRepository.kt
@@ -6,9 +6,7 @@ import org.fastcampus.member.entity.MemberAddress
 interface MemberAddressRepository {
     fun save(memberAddress: MemberAddress): MemberAddress
 
-    fun findByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): MemberAddress?
-
-    fun countByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): Long
+    fun countByUserIdAndMemberAddressTypeAndIsDeleted(userId: Long, memberAddressType: MemberAddressType, isDeleted: Boolean): Long
 
     fun findByUserId(userId: Long): List<MemberAddress>
 
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/entity/Order.kt b/domains/order/src/main/kotlin/org/fastcampus/order/entity/Order.kt
index 9cef0300..3e5231df 100644
--- a/domains/order/src/main/kotlin/org/fastcampus/order/entity/Order.kt
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/entity/Order.kt
@@ -117,3 +117,30 @@ data class Order(
         PACKING("T2", "포장"),
     }
 }
+
+fun Order.toOrderDetail(paymentType: Map<String, String>) =
+    OrderDetail(
+        id,
+        storeId,
+        storeName,
+        storeImageThumbnail,
+        userId,
+        roadAddress,
+        jibunAddress,
+        detailAddress,
+        tel,
+        mapOf("code" to status.code, "desc" to status.desc),
+        orderTime,
+        orderSummary,
+        mapOf("code" to type.code, "desc" to type.desc),
+        paymentId,
+        mapOf("code" to paymentType["code"], "desc" to paymentType["desc"]),
+        isDeleted,
+        deliveryCompleteTime,
+        orderPrice,
+        deliveryPrice,
+        paymentPrice,
+        excludingSpoonAndFork,
+        requestToRider,
+        orderMenus,
+    )
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderDetail.kt b/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderDetail.kt
new file mode 100644
index 00000000..169f21a2
--- /dev/null
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderDetail.kt
@@ -0,0 +1,29 @@
+package org.fastcampus.order.entity
+
+import java.time.LocalDateTime
+
+data class OrderDetail(
+    val orderId: String,
+    val storeId: String?,
+    val storeName: String?,
+    val storeImageThumbnail: String?,
+    val userId: Long?,
+    val roadAddress: String?,
+    val jibunAddress: String?,
+    val detailAddress: String?,
+    val tel: String?,
+    val status: Map<String, String?>,
+    val orderTime: LocalDateTime,
+    val orderSummary: String?,
+    val type: Map<String, String?>,
+    val paymentId: Long,
+    val paymentType: Map<String, String?>,
+    val isDeleted: Boolean,
+    val deliveryCompleteTime: LocalDateTime?,
+    val orderPrice: Long,
+    val deliveryPrice: Long?,
+    val paymentPrice: Long,
+    val excludingSpoonAndFork: Boolean = true,
+    val requestToRider: String? = null,
+    val orderMenus: List<OrderMenu>? = null,
+)
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderMenu.kt b/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderMenu.kt
index b66f698f..279e9d13 100644
--- a/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderMenu.kt
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/entity/OrderMenu.kt
@@ -14,9 +14,15 @@ data class OrderMenu(
     val totalPrice: Long,
     val orderMenuOptionGroups: List<OrderMenuOptionGroup>? = null, // 필요시 설정
 ) {
-    fun calculateOptionTotalPricePerMenuUnit(): Long {
-        return orderMenuOptionGroups
-            ?.flatMap { tempOptionGroup -> tempOptionGroup.orderMenuOptions ?: emptyList() }
-            ?.sumOf { it.menuOptionPrice } ?: 0
+    fun calculateMenuPrice(): Long {
+        // (메뉴 기본가격 + 옵션 총 가격) * 수량
+        return (
+            menuPrice +
+                (
+                    orderMenuOptionGroups
+                        ?.flatMap { tempOptionGroup -> tempOptionGroup.orderMenuOptions ?: emptyList() }
+                        ?.sumOf { it.menuOptionPrice } ?: 0
+                )
+        ) * menuQuantity
     }
 }
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/exception/OrderException.kt b/domains/order/src/main/kotlin/org/fastcampus/order/exception/OrderException.kt
index 5bc087d3..104d1207 100644
--- a/domains/order/src/main/kotlin/org/fastcampus/order/exception/OrderException.kt
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/exception/OrderException.kt
@@ -13,6 +13,8 @@ open class OrderException(message: String) : RuntimeException(message) {
 
     data class OrderCanNotCancelled(val orderId: String) : OrderException("해당 주문은 취소할 수 없습니다.")
 
+    data class OrderLockException(val orderId: String) : OrderException("잠시 후 다시 시도해주십시오.")
+
     data class StoreNotFound(val storeId: String) : OrderException("가게를 찾을 수 없습니다.")
 
     data class StoreClosed(val storeId: String) : OrderException("가게의 영업이 종료되어 주문이 불가능합니다.")
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderDetailRepository.kt b/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderDetailRepository.kt
new file mode 100644
index 00000000..79025a08
--- /dev/null
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderDetailRepository.kt
@@ -0,0 +1,11 @@
+package org.fastcampus.order.repository
+
+import org.fastcampus.order.entity.OrderDetail
+
+interface OrderDetailRepository {
+    fun saveOrderDetail(orderDetail: OrderDetail): OrderDetail
+
+    fun findById(orderId: String): OrderDetail?
+
+    fun updateStatus(orderId: String, status: Map<String, String>)
+}
diff --git a/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderLockManager.kt b/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderLockManager.kt
new file mode 100644
index 00000000..2da954e5
--- /dev/null
+++ b/domains/order/src/main/kotlin/org/fastcampus/order/repository/OrderLockManager.kt
@@ -0,0 +1,5 @@
+package org.fastcampus.order.repository
+
+interface OrderLockManager {
+    fun <R> lock(orderId: String, function: () -> R): R
+}
diff --git a/domains/payment/src/main/kotlin/org/fastcampus/payment/entity/Payment.kt b/domains/payment/src/main/kotlin/org/fastcampus/payment/entity/Payment.kt
index e9d9b2e5..337d9a52 100644
--- a/domains/payment/src/main/kotlin/org/fastcampus/payment/entity/Payment.kt
+++ b/domains/payment/src/main/kotlin/org/fastcampus/payment/entity/Payment.kt
@@ -5,12 +5,13 @@ data class Payment(
     val type: Type,
     val paymentPrice: Long?,
     val status: Status = Status.WAIT,
+    val pgKey: String? = null,
 ) {
     enum class Type(
         val code: String,
         val desc: String,
     ) {
-        KAKAO_PAY("P1", "카카오페이"),
+        PAY_200("P1", "PAY200"),
         TOSS_PAY("P2", "토스페이"),
     }
 
diff --git a/domains/payment/src/main/kotlin/org/fastcampus/payment/exception/PaymentException.kt b/domains/payment/src/main/kotlin/org/fastcampus/payment/exception/PaymentException.kt
index a785164c..bbd03b54 100644
--- a/domains/payment/src/main/kotlin/org/fastcampus/payment/exception/PaymentException.kt
+++ b/domains/payment/src/main/kotlin/org/fastcampus/payment/exception/PaymentException.kt
@@ -5,7 +5,16 @@ open class PaymentException(message: String) : RuntimeException(message) {
 
     data class UserNotMatching(val msg: String) : PaymentException("주문 유저가 일치하지 않습니다.")
 
+    data class OrderStatusIsNotWaiting(val orderId: String) : PaymentException("주문 상태가 올바르지 않습니다.")
+
     data class IncorrectAmount(val msg: String) : PaymentException("주문 금액이 올바르지 않습니다.")
 
     data class OrderNotFound(val orderId: String) : PaymentException("주문 정보를 찾을 수 없습니다.")
+
+    data class PgKeyNotExists(val paymentId: String) : PaymentException("PG Key가 존재하지 않습니다.")
+
+    data class NotSupportedPaymentType(val paymentType: String) : PaymentException("지원하지 않는 결제 타입입니다.")
+
+    // PG 요청에 대한 실패 공통 - PG 클라이언트 모듈이 반환하는 메세지를 그대로 클라이언트측까지 사용
+    data class PGFailed(val paymentId: String, val msg: String) : PaymentException(msg)
 }
diff --git a/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGateway.kt b/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGateway.kt
new file mode 100644
index 00000000..d4cafc29
--- /dev/null
+++ b/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGateway.kt
@@ -0,0 +1,5 @@
+package org.fastcampus.payment.gateway
+
+interface PaymentGateway {
+    fun approve(paymentKey: String, orderId: String, amount: Long): PaymentGatewayResponse
+}
diff --git a/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGatewayResponse.kt b/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGatewayResponse.kt
new file mode 100644
index 00000000..256b0492
--- /dev/null
+++ b/domains/payment/src/main/kotlin/org/fastcampus/payment/gateway/PaymentGatewayResponse.kt
@@ -0,0 +1,17 @@
+package org.fastcampus.payment.gateway
+
+data class PaymentGatewayResponse(
+    val status: Status,
+    val message: String = "",
+    val paymentKey: String = "",
+    val orderId: String = "",
+    val amount: Long = 0,
+) {
+    enum class Status {
+        DONE, // 결제 승인된 상태
+        ABORTED, // 결제 승인 실패 상태
+        EXPIRED, // 결제 유효 시간이 지나 거래가 취소된 상태
+        CANCELED, // 승인된 결제가 취소된 상태
+        FAILED, // toss payments 응답 에러코드일 때
+    }
+}
diff --git a/domains/review/src/main/kotlin/org/fastcampus/review/entity/Review.kt b/domains/review/src/main/kotlin/org/fastcampus/review/entity/Review.kt
index c7484267..7bc084de 100644
--- a/domains/review/src/main/kotlin/org/fastcampus/review/entity/Review.kt
+++ b/domains/review/src/main/kotlin/org/fastcampus/review/entity/Review.kt
@@ -38,16 +38,16 @@ class Review(
         tasteScore: Int,
         amountScore: Int,
         deliveryQuality: DeliveryQuality,
-        representativeImageUri: String? = null,
     ) {
         this.clientReviewContent = content
         this.totalScore = totalScore
         this.tasteScore = tasteScore
         this.amountScore = amountScore
         this.deliveryQuality = deliveryQuality
-        if (representativeImageUri != null) {
-            this.representativeImageUri = representativeImageUri
-        }
+    }
+
+    fun changeRepresentativeImageUri(imageUri: String?) {
+        this.representativeImageUri = imageUri
     }
 
     enum class DeliveryQuality(
diff --git a/domains/store/src/main/kotlin/org/fastcampus/store/redis/StoreRedisRepository.kt b/domains/store/src/main/kotlin/org/fastcampus/store/redis/StoreRedisRepository.kt
index 26293a0b..e5548e8e 100644
--- a/domains/store/src/main/kotlin/org/fastcampus/store/redis/StoreRedisRepository.kt
+++ b/domains/store/src/main/kotlin/org/fastcampus/store/redis/StoreRedisRepository.kt
@@ -19,7 +19,5 @@ interface StoreRedisRepository {
 
     fun getTrendKeywords(): Map<String, Long>?
 
-    fun removeOldData()
-
     fun existsByName(name: String): Boolean?
 }
diff --git a/flyway/migration/V14__add_pg_key_column_to_payment.sql b/flyway/migration/V14__add_pg_key_column_to_payment.sql
new file mode 100644
index 00000000..886cebba
--- /dev/null
+++ b/flyway/migration/V14__add_pg_key_column_to_payment.sql
@@ -0,0 +1,2 @@
+alter table public.payment
+    add pg_key varchar(255);
diff --git a/flyway/migration/V15__update_constraint_to_payment.sql b/flyway/migration/V15__update_constraint_to_payment.sql
new file mode 100644
index 00000000..c5ff9079
--- /dev/null
+++ b/flyway/migration/V15__update_constraint_to_payment.sql
@@ -0,0 +1,2 @@
+alter table public.payment
+    drop constraint payment_type_check;
diff --git a/infrastructure/external-pg-pay200/build.gradle.kts b/infrastructure/external-pg-pay200/build.gradle.kts
new file mode 100644
index 00000000..00c9d6ae
--- /dev/null
+++ b/infrastructure/external-pg-pay200/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+}
+
+dependencies {
+    implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
+
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation(project(":common"))
+
+    compileOnly(project(":domains:payment"))
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.0")
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveRequest.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveRequest.kt
new file mode 100644
index 00000000..c312bcd9
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveRequest.kt
@@ -0,0 +1,7 @@
+package org.fastcampus.payment.gateway.client
+
+data class Pay200ApproveRequest(
+    val paymentKey: String,
+    val orderId: String,
+    val amount: Long,
+)
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveResponse.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveResponse.kt
new file mode 100644
index 00000000..31c6e9c8
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200ApproveResponse.kt
@@ -0,0 +1,26 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+
+/**
+ * https://documenter.getpostman.com/view/6302762/2sAYXCkJsP#eeaccd42-4cb5-499a-8a64-e6bd78d8da60
+ */
+data class Pay200ApproveResponse(
+    val ok: Boolean = false,
+    val data: Data = Data(),
+) {
+    data class Data(
+        val orderId: String = "",
+        val paymentKey: String = "",
+        val amount: Long = 0L,
+    )
+
+    fun toPaymentGatewayResponse(): PaymentGatewayResponse {
+        return PaymentGatewayResponse(
+            status = PaymentGatewayResponse.Status.DONE,
+            paymentKey = data.paymentKey,
+            orderId = data.orderId,
+            amount = data.amount,
+        )
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Client.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Client.kt
new file mode 100644
index 00000000..edcfe6f2
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Client.kt
@@ -0,0 +1,11 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.config.Pay200ClientConfig
+import org.springframework.cloud.openfeign.FeignClient
+import org.springframework.web.bind.annotation.PostMapping
+
+@FeignClient(name = "pay200Client", url = "\${external.pay200.url}", configuration = [Pay200ClientConfig::class])
+interface Pay200Client {
+    @PostMapping("/api/v1/p/merchant/confirm")
+    fun approve(request: Pay200ApproveRequest): Pay200ApproveResponse
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Gateway.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Gateway.kt
new file mode 100644
index 00000000..c9b5d380
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/client/Pay200Gateway.kt
@@ -0,0 +1,36 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.PaymentGateway
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+import org.fastcampus.payment.gateway.error.Pay200Exception
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component("pay200Gateway")
+class Pay200Gateway(
+    private val pay200Client: Pay200Client,
+) : PaymentGateway {
+    override fun approve(paymentKey: String, orderId: String, amount: Long): PaymentGatewayResponse {
+        try {
+            val request = Pay200ApproveRequest(
+                paymentKey = paymentKey,
+                orderId = orderId,
+                amount = amount,
+            )
+            val response = pay200Client.approve(request)
+            return response.toPaymentGatewayResponse()
+        } catch (e: Pay200Exception) {
+            val errorResponse = e.error
+            logger.error("Pay200Gateway-approve-error: {}", errorResponse)
+            return errorResponse?.toPaymentGatewayResponse()
+                ?: PaymentGatewayResponse(
+                    status = PaymentGatewayResponse.Status.FAILED,
+                    message = "결제 승인 처리에 실패하였습니다.",
+                )
+        }
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(this::class.java)
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/config/Pay200ClientConfig.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/config/Pay200ClientConfig.kt
new file mode 100644
index 00000000..a45ec6f1
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/config/Pay200ClientConfig.kt
@@ -0,0 +1,62 @@
+package org.fastcampus.payment.gateway.config
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import feign.RequestInterceptor
+import feign.codec.Decoder
+import feign.codec.Encoder
+import feign.optionals.OptionalDecoder
+import org.fastcampus.payment.gateway.error.Pay200ErrorDecoder
+import org.springframework.beans.factory.ObjectFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters
+import org.springframework.cloud.openfeign.support.ResponseEntityDecoder
+import org.springframework.cloud.openfeign.support.SpringDecoder
+import org.springframework.cloud.openfeign.support.SpringEncoder
+import org.springframework.context.annotation.Bean
+import org.springframework.http.converter.HttpMessageConverter
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
+
+internal class Pay200ClientConfig {
+    @Bean
+    fun requestInterceptor(
+        @Value("\${external.pay200.secret}") secret: String,
+    ): RequestInterceptor {
+        // 인증헤더 설정
+        return RequestInterceptor { requestTemplate ->
+            requestTemplate.header("Authorization", "Basic $secret")
+        }
+    }
+
+    @Bean
+    fun tossPaymentsErrorDecoder(): Pay200ErrorDecoder {
+        return Pay200ErrorDecoder(feignObjectMapper())
+    }
+
+    @Bean
+    fun feignDecoder(): Decoder {
+        val jacksonConverter: HttpMessageConverter<*> = MappingJackson2HttpMessageConverter(feignObjectMapper())
+        val objectFactory: ObjectFactory<HttpMessageConverters> =
+            ObjectFactory<HttpMessageConverters> { HttpMessageConverters(jacksonConverter) }
+        return OptionalDecoder(ResponseEntityDecoder(SpringDecoder(objectFactory)))
+    }
+
+    @Bean
+    fun feignEncoder(): Encoder {
+        val jacksonConverter: HttpMessageConverter<*> = MappingJackson2HttpMessageConverter(feignObjectMapper())
+        val objectFactory: ObjectFactory<HttpMessageConverters> =
+            ObjectFactory<HttpMessageConverters> { HttpMessageConverters(jacksonConverter) }
+        return SpringEncoder(objectFactory)
+    }
+
+    @Bean("feignObjectMapper")
+    fun feignObjectMapper(): ObjectMapper {
+        val objectMapper = ObjectMapper()
+        objectMapper.apply {
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            registerKotlinModule()
+        }
+        return objectMapper
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ApproveErrorResponse.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ApproveErrorResponse.kt
new file mode 100644
index 00000000..91b36491
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ApproveErrorResponse.kt
@@ -0,0 +1,20 @@
+package org.fastcampus.payment.gateway.error
+
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+
+internal data class Pay200ApproveErrorResponse(
+    val ok: Boolean = false,
+    val error: Error = Error(),
+) {
+    data class Error(
+        val code: String = "",
+        val message: String = "",
+    )
+
+    fun toPaymentGatewayResponse(): PaymentGatewayResponse {
+        return PaymentGatewayResponse(
+            status = PaymentGatewayResponse.Status.FAILED,
+            message = "결제 승인 처리에 실패하였습니다.",
+        )
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ErrorDecoder.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ErrorDecoder.kt
new file mode 100644
index 00000000..e331002a
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200ErrorDecoder.kt
@@ -0,0 +1,37 @@
+package org.fastcampus.payment.gateway.error
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import feign.Response
+import feign.codec.ErrorDecoder
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Qualifier
+import java.io.IOException
+import java.lang.Exception
+import java.nio.charset.StandardCharsets
+
+/**
+ * HTTP 응답 상태코드 2XX 범위 외 경우일 때.
+ */
+internal class Pay200ErrorDecoder(
+    @Qualifier("feignObjectMapper")
+    private val objectMapper: ObjectMapper,
+) : ErrorDecoder {
+    override fun decode(methodKey: String?, response: Response?): Exception {
+        logger.error("{} 에러", methodKey)
+        logger.debug("{}", response?.body())
+        try {
+            val body = response?.body()?.asInputStream()?.readAllBytes()?.let { String(it, StandardCharsets.UTF_8) }
+            if (body == null) {
+                return Pay200Exception("", Pay200ApproveErrorResponse())
+            }
+            val errorResponse = objectMapper.readValue(body, Pay200ApproveErrorResponse::class.java)
+            return Pay200Exception(errorResponse.error.message, errorResponse)
+        } catch (e: IOException) {
+            return Pay200Exception(message = "에러 메세지 파싱 에러")
+        }
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(this::class.java)
+    }
+}
diff --git a/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200Exception.kt b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200Exception.kt
new file mode 100644
index 00000000..4645c6ba
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/kotlin/org/fastcampus/payment/gateway/error/Pay200Exception.kt
@@ -0,0 +1,6 @@
+package org.fastcampus.payment.gateway.error
+
+internal data class Pay200Exception(
+    override val message: String,
+    val error: Pay200ApproveErrorResponse? = null,
+) : RuntimeException(message)
diff --git a/infrastructure/external-pg-pay200/src/main/resources/application-pg-pay200.yml b/infrastructure/external-pg-pay200/src/main/resources/application-pg-pay200.yml
new file mode 100644
index 00000000..d36dd0ec
--- /dev/null
+++ b/infrastructure/external-pg-pay200/src/main/resources/application-pg-pay200.yml
@@ -0,0 +1,19 @@
+spring:
+  config:
+    activate:
+      on-profile: local
+external:
+  pay200:
+    url: https://payment.pay-200.com
+    secret: none
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: dev, prod
+external:
+  pay200:
+    url: https://payment.pay-200.com
+    secret: ${PAY200_SECRET}
diff --git a/infrastructure/external-pg-toss-payments/build.gradle.kts b/infrastructure/external-pg-toss-payments/build.gradle.kts
new file mode 100644
index 00000000..00c9d6ae
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+}
+
+dependencies {
+    implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
+
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation(project(":common"))
+
+    compileOnly(project(":domains:payment"))
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.0")
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsApproveRequest.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsApproveRequest.kt
new file mode 100644
index 00000000..03025c36
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsApproveRequest.kt
@@ -0,0 +1,7 @@
+package org.fastcampus.payment.gateway.client
+
+data class TossPaymentsApproveRequest(
+    val paymentKey: String,
+    val orderId: String,
+    val amount: Long,
+)
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsClient.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsClient.kt
new file mode 100644
index 00000000..1ac321d8
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsClient.kt
@@ -0,0 +1,11 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.config.TossPaymentsClientConfig
+import org.springframework.cloud.openfeign.FeignClient
+import org.springframework.web.bind.annotation.PostMapping
+
+@FeignClient(name = "tossPaymentsClient", url = "\${external.tosspayments.url}", configuration = [TossPaymentsClientConfig::class])
+interface TossPaymentsClient {
+    @PostMapping("/v1/payments/confirm")
+    fun approve(request: TossPaymentsApproveRequest): TossPaymentsResponse
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsGateway.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsGateway.kt
new file mode 100644
index 00000000..f79627bc
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsGateway.kt
@@ -0,0 +1,37 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.PaymentGateway
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+import org.fastcampus.payment.gateway.error.TossPaymentsException
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component("tossPaymentsGateway")
+class TossPaymentsGateway(
+    private val tossPaymentsClient: TossPaymentsClient,
+) : PaymentGateway {
+    override fun approve(paymentKey: String, orderId: String, amount: Long): PaymentGatewayResponse {
+        try {
+            val request = TossPaymentsApproveRequest(
+                paymentKey = paymentKey,
+                orderId = orderId,
+                amount = amount,
+            )
+            val response = tossPaymentsClient.approve(request)
+            return response.toPaymentGatewayResponse()
+        } catch (e: TossPaymentsException) {
+            val errorResponse = e.error
+            logger.error("TossPaymentsGateway-approve-error: {}", errorResponse)
+
+            return errorResponse?.toPaymentGatewayResponse()
+                ?: PaymentGatewayResponse(
+                    status = PaymentGatewayResponse.Status.FAILED,
+                    message = "결제 승인 처리에 실패하였습니다.",
+                )
+        }
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(this::class.java)
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsResponse.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsResponse.kt
new file mode 100644
index 00000000..7357ec7a
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/client/TossPaymentsResponse.kt
@@ -0,0 +1,45 @@
+package org.fastcampus.payment.gateway.client
+
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+
+/**
+ * https://docs.tosspayments.com/reference#payment-객체
+ */
+data class TossPaymentsResponse(
+    val status: Status,
+    val mId: String = "",
+    val paymentKey: String = "",
+    val orderId: String = "",
+    val orderName: String = "",
+    val totalAmount: Long = 0,
+) {
+    enum class Status {
+        READY,
+        IN_PROGRESS,
+        WAITING_FOR_DEPOSIT,
+        DONE,
+        CANCELED,
+        PARTIAL_CANCELED,
+        ABORTED,
+        EXPIRED,
+    }
+
+    fun toPaymentGatewayResponse(): PaymentGatewayResponse {
+        val status = when (this.status) {
+            Status.EXPIRED -> PaymentGatewayResponse.Status.EXPIRED
+            Status.DONE -> PaymentGatewayResponse.Status.DONE
+            Status.ABORTED -> PaymentGatewayResponse.Status.ABORTED
+            Status.CANCELED -> PaymentGatewayResponse.Status.CANCELED
+            Status.PARTIAL_CANCELED -> TODO()
+            Status.READY -> TODO()
+            Status.IN_PROGRESS -> TODO()
+            Status.WAITING_FOR_DEPOSIT -> TODO()
+        }
+        return PaymentGatewayResponse(
+            status = status,
+            paymentKey = paymentKey,
+            orderId = orderId,
+            amount = totalAmount,
+        )
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/config/TossPaymentsClientConfig.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/config/TossPaymentsClientConfig.kt
new file mode 100644
index 00000000..425c79db
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/config/TossPaymentsClientConfig.kt
@@ -0,0 +1,64 @@
+package org.fastcampus.payment.gateway.config
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import feign.RequestInterceptor
+import feign.codec.Decoder
+import feign.codec.Encoder
+import feign.optionals.OptionalDecoder
+import org.fastcampus.payment.gateway.error.TossPaymentsErrorDecoder
+import org.springframework.beans.factory.ObjectFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters
+import org.springframework.cloud.openfeign.support.ResponseEntityDecoder
+import org.springframework.cloud.openfeign.support.SpringDecoder
+import org.springframework.cloud.openfeign.support.SpringEncoder
+import org.springframework.context.annotation.Bean
+import org.springframework.http.converter.HttpMessageConverter
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
+import java.util.*
+
+internal class TossPaymentsClientConfig {
+    @Bean
+    fun requestInterceptor(
+        @Value("\${external.tosspayments.secret}") secret: String,
+    ): RequestInterceptor {
+        // 인증헤더 설정
+        val encodedSecretKey = Base64.getEncoder().encodeToString("$secret:".toByteArray())
+        return RequestInterceptor { requestTemplate ->
+            requestTemplate.header("Authorization", "Basic $encodedSecretKey")
+        }
+    }
+
+    @Bean
+    fun tossPaymentsErrorDecoder(): TossPaymentsErrorDecoder {
+        return TossPaymentsErrorDecoder(feignObjectMapper())
+    }
+
+    @Bean
+    fun feignDecoder(): Decoder {
+        val jacksonConverter: HttpMessageConverter<*> = MappingJackson2HttpMessageConverter(feignObjectMapper())
+        val objectFactory: ObjectFactory<HttpMessageConverters> =
+            ObjectFactory<HttpMessageConverters> { HttpMessageConverters(jacksonConverter) }
+        return OptionalDecoder(ResponseEntityDecoder(SpringDecoder(objectFactory)))
+    }
+
+    @Bean
+    fun feignEncoder(): Encoder {
+        val jacksonConverter: HttpMessageConverter<*> = MappingJackson2HttpMessageConverter(feignObjectMapper())
+        val objectFactory: ObjectFactory<HttpMessageConverters> =
+            ObjectFactory<HttpMessageConverters> { HttpMessageConverters(jacksonConverter) }
+        return SpringEncoder(objectFactory)
+    }
+
+    @Bean("feignObjectMapper")
+    fun feignObjectMapper(): ObjectMapper {
+        val objectMapper = ObjectMapper()
+        objectMapper.apply {
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            registerKotlinModule()
+        }
+        return objectMapper
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsApproveErrorResponse.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsApproveErrorResponse.kt
new file mode 100644
index 00000000..c431d741
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsApproveErrorResponse.kt
@@ -0,0 +1,54 @@
+package org.fastcampus.payment.gateway.error
+
+import org.fastcampus.payment.gateway.PaymentGatewayResponse
+
+internal data class TossPaymentsApproveErrorResponse(
+    val code: String = "",
+    val message: String = "",
+) {
+    fun toPaymentGatewayResponse(): PaymentGatewayResponse {
+        return PaymentGatewayResponse(
+            status = PaymentGatewayResponse.Status.FAILED,
+            message = MESSAGE_BY_ERROR_CODE.getOrDefault(this.code, "결제 승인 처리에 실패하였습니다."),
+        )
+    }
+
+    /**
+     * 토스측 결제승인 에러코드 일부분. https://docs.tosspayments.com/reference/error-codes#코어-api-별-에러
+     * 아래 설정한 에러코드 메세지 외 나머지는 통일된 메세지로 처리한다.
+     */
+    companion object {
+        private val MESSAGE_BY_ERROR_CODE = mapOf(
+            "ALREADY_PROCESSED_PAYMENT" to "이미 처리된 결제입니다.",
+            "PROVIDER_ERROR" to "일시적인 오류가 발생하였습니다.",
+            "INVALID_REJECT_CARD" to "카드 사용이 거절되었습니다.",
+            "BELOW_MINIMUM_AMOUNT" to "신용카드는 결제금액이 100원 이상, 계좌는 200원이상부터 결제가 가능합니다.",
+            "INVALID_CARD_EXPIRATION" to "카드 정보를 다시 확인해주세요.",
+            "INVALID_STOPPED_CARD" to "정지된 카드 입니다.",
+            "EXCEED_MAX_DAILY_PAYMENT_COUNT" to "하루 결제 가능 횟수를 초과했습니다.",
+            "INVALID_CARD_LOST_OR_STOLEN" to "분실 혹은 도난 카드입니다.",
+            "INVALID_CARD_NUMBER" to "카드번호를 다시 확인해주세요.",
+            "CARD_PROCESSING_ERROR" to "카드사에서 오류가 발생했습니다.",
+            "EXCEED_MAX_ONE_DAY_WITHDRAW_AMOUNT" to "1일 출금 한도를 초과했습니다.",
+            "EXCEED_MAX_ONE_TIME_WITHDRAW_AMOUNT" to "1회 출금 한도를 초과했습니다.",
+            "EXCEED_MAX_MONTHLY_PAYMENT_AMOUNT" to "당월 결제 가능금액을 초과 하셨습니다.",
+            "EXCEED_MAX_AMOUNT" to "거래금액 한도를 초과했습니다.",
+            "INVALID_ACCOUNT_INFO_RE_REGISTER" to "유효하지 않은 계좌입니다. 계좌 재등록 후 시도해주세요.",
+            "NOT_AVAILABLE_PAYMENT" to "결제가 불가능한 시간대입니다.",
+            "UNAPPROVED_ORDER_ID" to "아직 승인되지 않은 주문입니다.",
+            "REJECT_ACCOUNT_PAYMENT" to "잔액부족으로 결제에 실패했습니다.",
+            "REJECT_CARD_PAYMENT" to "한도초과 혹은 잔액부족으로 결제에 실패했습니다",
+            "REJECT_CARD_COMPANY" to "결제 승인이 거절되었습니다.",
+            "EXCEED_MAX_AUTH_COUNT" to "최대 인증 횟수를 초과했습니다. 카드사로 문의해주세요.",
+            "EXCEED_MAX_ONE_DAY_AMOUNT" to "일일 한도를 초과했습니다.",
+            "NOT_AVAILABLE_BANK" to "은행 서비스 시간이 아닙니다.",
+            "INVALID_PASSWORD" to "결제 비밀번호가 일치하지 않습니다.",
+            "FDS_ERROR" to "[토스페이먼츠] 위험거래가 감지되어 결제가 제한됩니다. 발송된 문자에 포함된 링크를 통해 본인인증 후 결제가 가능합니다. (고객센터: 1644-8051)",
+            "NOT_FOUND_PAYMENT" to "존재하지 않는 결제 정보 입니다.",
+            "NOT_FOUND_PAYMENT_SESSION" to "결제 시간이 만료되어 결제 진행 데이터가 존재하지 않습니다.",
+            "FAILED_PAYMENT_INTERNAL_SYSTEM_PROCESSING" to "결제가 완료되지 않았어요. 다시 시도해주세요.",
+            "FAILED_INTERNAL_SYSTEM_PROCESSING" to "PG사 처리 작업이 실패했습니다. 잠시 후 다시 시도해주세요.",
+            "UNKNOWN_PAYMENT_ERROR" to "결제에 실패했어요. 같은 문제가 반복된다면 은행이나 카드사로 문의해주세요.",
+        )
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsErrorDecoder.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsErrorDecoder.kt
new file mode 100644
index 00000000..f64304c6
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsErrorDecoder.kt
@@ -0,0 +1,37 @@
+package org.fastcampus.payment.gateway.error
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import feign.Response
+import feign.codec.ErrorDecoder
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Qualifier
+import java.io.IOException
+import java.lang.Exception
+import java.nio.charset.StandardCharsets
+
+/**
+ * HTTP 응답 상태코드 2XX 범위 외 경우일 때.
+ */
+internal class TossPaymentsErrorDecoder(
+    @Qualifier("feignObjectMapper")
+    private val objectMapper: ObjectMapper,
+) : ErrorDecoder {
+    override fun decode(methodKey: String?, response: Response?): Exception {
+        logger.error("{} 에러", methodKey)
+        logger.debug("{}", response?.body())
+        try {
+            val body = response?.body()?.asInputStream()?.readAllBytes()?.let { String(it, StandardCharsets.UTF_8) }
+            if (body == null) {
+                return TossPaymentsException("", TossPaymentsApproveErrorResponse())
+            }
+            val errorResponse = objectMapper.readValue(body, TossPaymentsApproveErrorResponse::class.java)
+            return TossPaymentsException(errorResponse.message, errorResponse)
+        } catch (e: IOException) {
+            return TossPaymentsException(message = "에러 메세지 파싱 에러")
+        }
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(this::class.java)
+    }
+}
diff --git a/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsException.kt b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsException.kt
new file mode 100644
index 00000000..cc1a4c2c
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/kotlin/org/fastcampus/payment/gateway/error/TossPaymentsException.kt
@@ -0,0 +1,6 @@
+package org.fastcampus.payment.gateway.error
+
+internal data class TossPaymentsException(
+    override val message: String,
+    val error: TossPaymentsApproveErrorResponse? = null,
+) : RuntimeException(message)
diff --git a/infrastructure/external-pg-toss-payments/src/main/resources/application-pg-toss-payments.yml b/infrastructure/external-pg-toss-payments/src/main/resources/application-pg-toss-payments.yml
new file mode 100644
index 00000000..0123be0f
--- /dev/null
+++ b/infrastructure/external-pg-toss-payments/src/main/resources/application-pg-toss-payments.yml
@@ -0,0 +1,19 @@
+spring:
+  config:
+    activate:
+      on-profile: local
+external:
+  tosspayments:
+    url: https://api.tosspayments.com
+    secret: none
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: dev, prod
+external:
+  tosspayments:
+    url: https://api.tosspayments.com
+    secret: ${TOSSPAYMENTS_SECRET}
diff --git a/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressJpaRepository.kt b/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressJpaRepository.kt
index 700a66e8..3a174342 100644
--- a/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressJpaRepository.kt
+++ b/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressJpaRepository.kt
@@ -6,9 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository
 import java.util.*
 
 interface MemberAddressJpaRepository : JpaRepository<MemberAddressJpaEntity, Long> {
-    fun findByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): Optional<MemberAddressJpaEntity>
-
-    fun countByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): Long
+    fun countByUserIdAndMemberAddressTypeAndIsDeleted(userId: Long, memberAddressType: MemberAddressType, isDeleted: Boolean): Long
 
     fun findByUserId(userId: Long): List<MemberAddressJpaEntity>
 
diff --git a/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressRepositoryCustom.kt b/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressRepositoryCustom.kt
index d8200f45..dd9e5c4d 100644
--- a/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressRepositoryCustom.kt
+++ b/infrastructure/member-postgres/src/main/kotlin/org/fastcampus/member/postgres/repository/MemberAddressRepositoryCustom.kt
@@ -15,16 +15,16 @@ class MemberAddressRepositoryCustom(
         return memberAddressJpaRepository.save(memberAddress.toJpaEntity()).toModel()
     }
 
-    override fun findByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): MemberAddress? {
-        return memberAddressJpaRepository.findByUserIdAndMemberAddressType(userId, memberAddressType).map { it.toModel() }.orElse(null)
-    }
-
-    override fun countByUserIdAndMemberAddressType(userId: Long, memberAddressType: MemberAddressType): Long {
-        return memberAddressJpaRepository.countByUserIdAndMemberAddressType(userId, memberAddressType)
+    override fun countByUserIdAndMemberAddressTypeAndIsDeleted(
+        userId: Long,
+        memberAddressType: MemberAddressType,
+        isDeleted: Boolean,
+    ): Long {
+        return memberAddressJpaRepository.countByUserIdAndMemberAddressTypeAndIsDeleted(userId, memberAddressType, isDeleted)
     }
 
     override fun findByUserId(userId: Long): List<MemberAddress> {
-        return memberAddressJpaRepository.findByUserId(userId).filter { !it.isDeleted }.map { it.toModel() }.toList()
+        return memberAddressJpaRepository.findByUserId(userId).filter { !it.isDeleted }.map { it.toModel() }.sortedByDescending { it.id }
     }
 
     override fun findByUserIdAndIsDefault(userId: Long, isDefault: Boolean): MemberAddress? {
diff --git a/infrastructure/order-mongo/build.gradle.kts b/infrastructure/order-mongo/build.gradle.kts
new file mode 100644
index 00000000..90d7e8f1
--- /dev/null
+++ b/infrastructure/order-mongo/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
+    compileOnly(project(":domains:order"))
+    implementation(project(":common"))
+}
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/config/OrderMongoDBConfig.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/config/OrderMongoDBConfig.kt
new file mode 100644
index 00000000..e51ac965
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/config/OrderMongoDBConfig.kt
@@ -0,0 +1,8 @@
+package org.fastcampus.order.config
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories
+
+@Configuration
+@EnableMongoRepositories(basePackages = ["org.fastcampus.order.repository"])
+class OrderMongoDBConfig
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderDetailDocument.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderDetailDocument.kt
new file mode 100644
index 00000000..d37f899a
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderDetailDocument.kt
@@ -0,0 +1,94 @@
+package org.fastcampus.order.document
+
+import org.bson.types.ObjectId
+import org.fastcampus.order.entity.OrderDetail
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.mapping.Document
+import org.springframework.data.mongodb.core.mapping.Field
+import java.time.LocalDateTime
+
+@Document(collection = "orderDetails")
+class OrderDetailDocument(
+    @Id
+    @Field(name = "_id")
+    val _id: ObjectId? = null,
+    val orderId: String,
+    val storeId: String?,
+    val storeName: String?,
+    val storeImageThumbnail: String?,
+    val userId: Long?,
+    val status: Map<String, String?>,
+    val orderTime: LocalDateTime,
+    val orderSummary: String?,
+    val isDeleted: Boolean,
+    val tel: String?,
+    val roadAddress: String?,
+    val jibunAddress: String?,
+    val detailAddress: String?,
+    val excludingSpoonAndFork: Boolean,
+    val requestToRider: String?,
+    val orderPrice: Long,
+    val deliveryPrice: Long?,
+    val deliveryCompleteTime: LocalDateTime?,
+    val paymentPrice: Long,
+    val paymentId: Long,
+    val paymentType: Map<String, String?>,
+    val type: Map<String, String?>,
+    @Field(name = "orderMenus")
+    val orderMenuDocument: List<OrderMenuDocument>? = null,
+)
+
+fun OrderDetail.toJpaDocument() =
+    OrderDetailDocument(
+        null,
+        orderId,
+        storeId,
+        storeName,
+        storeImageThumbnail,
+        userId,
+        mapOf("code" to status["code"], "desc" to status["desc"]),
+        orderTime,
+        orderSummary,
+        isDeleted,
+        tel,
+        roadAddress,
+        jibunAddress,
+        detailAddress,
+        excludingSpoonAndFork,
+        requestToRider,
+        orderPrice,
+        deliveryPrice,
+        deliveryCompleteTime,
+        paymentPrice,
+        paymentId,
+        mapOf("code" to paymentType["code"], "desc" to paymentType["desc"]),
+        mapOf("code" to type["code"], "desc" to type["desc"]),
+        orderMenus?.map { it.toJpaDocument() },
+    )
+
+fun OrderDetailDocument.toModel() =
+    OrderDetail(
+        orderId,
+        storeId,
+        storeName,
+        storeImageThumbnail,
+        userId,
+        roadAddress,
+        jibunAddress,
+        detailAddress,
+        tel,
+        mapOf("code" to status["code"], "desc" to status["desc"]),
+        orderTime,
+        orderSummary,
+        mapOf("code" to type["code"], "desc" to type["desc"]),
+        paymentId,
+        mapOf("code" to paymentType["code"], "desc" to paymentType["desc"]),
+        isDeleted,
+        deliveryCompleteTime,
+        orderPrice,
+        deliveryPrice,
+        paymentPrice,
+        excludingSpoonAndFork,
+        requestToRider,
+        orderMenuDocument?.map { it.toModel() },
+    )
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuDocument.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuDocument.kt
new file mode 100644
index 00000000..00315f86
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuDocument.kt
@@ -0,0 +1,38 @@
+package org.fastcampus.order.document
+
+import org.fastcampus.order.entity.OrderMenu
+import org.springframework.data.mongodb.core.mapping.Field
+
+class OrderMenuDocument(
+    @Field(name = "id")
+    val id: Long? = null,
+    val menuId: String,
+    val menuName: String,
+    val menuQuantity: Long,
+    val menuPrice: Long,
+    val totalPrice: Long,
+    val orderMenuOptionGroupDocument: List<OrderMenuOptionGroupDocument>? = null,
+)
+
+fun OrderMenu.toJpaDocument() =
+    OrderMenuDocument(
+        id,
+        menuId,
+        menuName,
+        menuQuantity,
+        menuPrice,
+        totalPrice,
+        orderMenuOptionGroups?.map { it.toJpaDocument() },
+    )
+
+fun OrderMenuDocument.toModel() =
+    OrderMenu(
+        id,
+        "",
+        menuId,
+        menuName,
+        menuQuantity,
+        menuPrice,
+        totalPrice,
+        orderMenuOptionGroupDocument?.map { it.toModel() },
+    )
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionDocument.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionDocument.kt
new file mode 100644
index 00000000..9f463dfd
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionDocument.kt
@@ -0,0 +1,28 @@
+package org.fastcampus.order.document
+
+import org.fastcampus.order.entity.OrderMenuOption
+import org.springframework.data.mongodb.core.mapping.Field
+
+class OrderMenuOptionDocument(
+    @Field(name = "id")
+    val id: Long? = null,
+    val orderMenuOptionGroupId: Long,
+    val menuOptionName: String,
+    val menuOptionPrice: Long,
+)
+
+fun OrderMenuOption.toJpaDocument() =
+    OrderMenuOptionDocument(
+        id,
+        orderMenuOptionGroupId,
+        menuOptionName,
+        menuOptionPrice,
+    )
+
+fun OrderMenuOptionDocument.toModel() =
+    OrderMenuOption(
+        id,
+        orderMenuOptionGroupId,
+        menuOptionName,
+        menuOptionPrice,
+    )
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionGroupDocument.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionGroupDocument.kt
new file mode 100644
index 00000000..61e334c0
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/document/OrderMenuOptionGroupDocument.kt
@@ -0,0 +1,28 @@
+package org.fastcampus.order.document
+
+import org.fastcampus.order.entity.OrderMenuOptionGroup
+import org.springframework.data.mongodb.core.mapping.Field
+
+class OrderMenuOptionGroupDocument(
+    @Field(name = "id")
+    val id: Long? = null,
+    val orderMenuId: Long,
+    val orderMenuOptionGroupName: String,
+    val orderMenuOptionDocument: List<OrderMenuOptionDocument>? = null,
+)
+
+fun OrderMenuOptionGroup.toJpaDocument() =
+    OrderMenuOptionGroupDocument(
+        id,
+        orderMenuId,
+        orderMenuOptionGroupName,
+        orderMenuOptions?.map { it.toJpaDocument() },
+    )
+
+fun OrderMenuOptionGroupDocument.toModel() =
+    OrderMenuOptionGroup(
+        id,
+        orderMenuId,
+        orderMenuOptionGroupName,
+        orderMenuOptionDocument?.map { it.toModel() },
+    )
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepository.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepository.kt
new file mode 100644
index 00000000..a376cb6c
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepository.kt
@@ -0,0 +1,10 @@
+package org.fastcampus.order.repository
+
+import org.bson.types.ObjectId
+import org.fastcampus.order.document.OrderDetailDocument
+import org.springframework.data.mongodb.repository.MongoRepository
+import java.util.*
+
+interface OrderDetailMongoRepository : MongoRepository<OrderDetailDocument, ObjectId> {
+    fun findByOrderId(orderId: String): Optional<OrderDetailDocument>?
+}
diff --git a/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepositoryCustom.kt b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepositoryCustom.kt
new file mode 100644
index 00000000..fea0dfea
--- /dev/null
+++ b/infrastructure/order-mongo/src/main/kotlin/org/fastcampus/order/repository/OrderDetailMongoRepositoryCustom.kt
@@ -0,0 +1,34 @@
+package org.fastcampus.order.repository
+
+import org.fastcampus.order.document.OrderDetailDocument
+import org.fastcampus.order.document.toJpaDocument
+import org.fastcampus.order.document.toModel
+import org.fastcampus.order.entity.OrderDetail
+import org.springframework.data.mongodb.core.MongoTemplate
+import org.springframework.data.mongodb.core.query.Criteria
+import org.springframework.data.mongodb.core.query.Query
+import org.springframework.data.mongodb.core.query.Update
+import org.springframework.stereotype.Component
+
+@Component
+class OrderDetailMongoRepositoryCustom(
+    private val orderDetailMongoRepository: OrderDetailMongoRepository,
+    private val mongoTemplate: MongoTemplate,
+) : OrderDetailRepository {
+    override fun saveOrderDetail(orderDetail: OrderDetail): OrderDetail {
+        return orderDetailMongoRepository.save(orderDetail.toJpaDocument()).toModel()
+    }
+
+    override fun findById(orderId: String): OrderDetail? {
+        return orderDetailMongoRepository.findByOrderId(orderId)
+            ?.map { it.toModel() }
+            ?.orElse(null)
+    }
+
+    override fun updateStatus(orderId: String, status: Map<String, String>) {
+        val query = Query(Criteria.where("orderId").`is`(orderId))
+        val update = Update()
+            .set("status", status)
+        mongoTemplate.updateFirst(query, update, OrderDetailDocument::class.java)
+    }
+}
diff --git a/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationadmin/event/RedisMessageConfig.kt b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationadmin/event/RedisMessageConfig.kt
index 7ae1d895..f61b86e5 100644
--- a/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationadmin/event/RedisMessageConfig.kt
+++ b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationadmin/event/RedisMessageConfig.kt
@@ -14,17 +14,21 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
 @Configuration
 class RedisMessageConfig(
     @Qualifier("OrderNotificationReceiver")
-    private val notificationReceiver: NotificationReceiver,
+    private val orderNotificationReceiver: NotificationReceiver,
+    @Qualifier("OrderCancellationReceiver")
+    private val orderCancellationReceiver: NotificationReceiver,
 ) {
     @Bean
     fun redisContainer(
         connectionFactory: RedisConnectionFactory,
-        @Qualifier("OrderNotificationReceiverAdapter") listenerAdapter: MessageListenerAdapter,
+        @Qualifier("OrderNotificationReceiverAdapter") orderNotificationListenerAdapter: MessageListenerAdapter,
+        @Qualifier("OrderCancellationReceiverAdapter") orderCancellationReceiverAdapter: MessageListenerAdapter,
     ): RedisMessageListenerContainer {
         return RedisMessageListenerContainer()
             .apply {
                 setConnectionFactory(connectionFactory)
-                addMessageListener(listenerAdapter, PatternTopic("ORDER_NOTIFICATION"))
+                addMessageListener(orderNotificationListenerAdapter, PatternTopic("ORDER_NOTIFICATION"))
+                addMessageListener(orderCancellationReceiverAdapter, PatternTopic("ORDER_CANCELLATION"))
                 setTaskExecutor(
                     ThreadPoolTaskExecutor().apply {
                         val cpuCoreCount = Runtime.getRuntime().availableProcessors()
@@ -40,8 +44,13 @@ class RedisMessageConfig(
     }
 
     @Bean("OrderNotificationReceiverAdapter")
-    fun listenerAdapter(): MessageListenerAdapter {
-        return MessageListenerAdapter(notificationReceiver)
+    fun orderNotificationReceiverAdapter(): MessageListenerAdapter {
+        return MessageListenerAdapter(orderNotificationReceiver)
+    }
+
+    @Bean("OrderCancellationReceiverAdapter")
+    fun orderCancellationReceiverAdapter(): MessageListenerAdapter {
+        return MessageListenerAdapter(orderCancellationReceiver)
     }
 
     @Bean
diff --git a/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationclient/event/OrderCancellationSender.kt b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationclient/event/OrderCancellationSender.kt
new file mode 100644
index 00000000..d838adf6
--- /dev/null
+++ b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/applicationclient/event/OrderCancellationSender.kt
@@ -0,0 +1,23 @@
+package org.fastcampus.applicationclient.event
+
+import org.fastcampus.order.event.NotificationSender
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.data.redis.core.StringRedisTemplate
+import org.springframework.stereotype.Component
+
+@Component("OrderCancellationSender")
+class OrderCancellationSender(
+    private val stringRedisTemplate: StringRedisTemplate,
+) : NotificationSender {
+    companion object {
+        private val logger: Logger = LoggerFactory.getLogger(OrderCancellationSender::class.java)
+
+        private const val CHANNEL = "ORDER_CANCELLATION"
+    }
+
+    override fun send(message: String) {
+        logger.debug("send message: {}", message)
+        stringRedisTemplate.convertAndSend(CHANNEL, message)
+    }
+}
diff --git a/infrastructure/order-redis/src/main/kotlin/org/fastcampus/order/repository/OrderLockManagerCustom.kt b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/order/repository/OrderLockManagerCustom.kt
new file mode 100644
index 00000000..614bd877
--- /dev/null
+++ b/infrastructure/order-redis/src/main/kotlin/org/fastcampus/order/repository/OrderLockManagerCustom.kt
@@ -0,0 +1,54 @@
+package org.fastcampus.order.repository
+
+import org.fastcampus.order.exception.OrderException
+import org.slf4j.LoggerFactory
+import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.stereotype.Component
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.toJavaDuration
+
+@Component
+class OrderLockManagerCustom(
+    private val redisTemplate: RedisTemplate<String, Any>,
+) : OrderLockManager {
+    // 외부에서 전달받을까도 고민했으나 Order Lock 에 대한 책임만 가지고 있으므로 내부에서 가져도 된다고 판단.
+    // 외부에서 받을 경우 실제 서비스로직을 봐야하기에 더욱더 북잡해진다고 판단.
+    private val maxAttempts = 3
+    private val backoffMillis = 100L // 0.1초
+    private val lockExpireSecond = 30L // 30초
+
+    override fun <R> lock(orderId: String, function: () -> R): R {
+        val lockKey = "order_lock:$orderId"
+        var attempts = 0
+        while (attempts < maxAttempts) {
+            val success = tryAcquireLock(lockKey)
+            if (success) {
+                logger.debug("Lock acquired for orderId: {}", orderId)
+                try {
+                    return function()
+                } finally {
+                    releaseLock(lockKey)
+                    logger.debug("Lock released for orderId: {}", orderId)
+                }
+            } else {
+                attempts++
+                Thread.sleep(backoffMillis)
+            }
+        }
+        throw OrderException.OrderLockException(orderId)
+    }
+
+    // redis 의 이슈로 lock 획득이 안되어도 프로세스는 진행
+    private fun tryAcquireLock(lockKey: String): Boolean {
+        return redisTemplate.opsForValue()
+            .setIfAbsent(lockKey, "locked", lockExpireSecond.seconds.toJavaDuration()) ?: true
+    }
+
+    private fun releaseLock(lockKey: String) {
+        redisTemplate.delete(lockKey)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(OrderLockManager::class.java)
+    }
+}
diff --git a/infrastructure/payment-postgres/src/main/kotlin/org/fastcampus/payment/postgres/entity/PaymentJpaEntity.kt b/infrastructure/payment-postgres/src/main/kotlin/org/fastcampus/payment/postgres/entity/PaymentJpaEntity.kt
index a284791b..dee31e1c 100644
--- a/infrastructure/payment-postgres/src/main/kotlin/org/fastcampus/payment/postgres/entity/PaymentJpaEntity.kt
+++ b/infrastructure/payment-postgres/src/main/kotlin/org/fastcampus/payment/postgres/entity/PaymentJpaEntity.kt
@@ -26,6 +26,8 @@ class PaymentJpaEntity(
     @Enumerated(EnumType.STRING)
     @Column(name = "STATUS")
     val status: Payment.Status,
+    @Column(name = "PG_KEY")
+    val pgKey: String? = null,
 ) : BaseEntity()
 
 fun Payment.toJpaEntity() =
@@ -34,6 +36,7 @@ fun Payment.toJpaEntity() =
         type,
         paymentPrice,
         status,
+        pgKey,
     )
 
 fun PaymentJpaEntity.toModel() =
@@ -42,4 +45,5 @@ fun PaymentJpaEntity.toModel() =
         type,
         paymentPrice,
         status,
+        pgKey,
     )
diff --git a/infrastructure/store-redis/src/main/kotlin/org/fastcampus/store/redis/repository/StoreRedisRepositoryImpl.kt b/infrastructure/store-redis/src/main/kotlin/org/fastcampus/store/redis/repository/StoreRedisRepositoryImpl.kt
index 5ea0a4d9..eb97b9ad 100644
--- a/infrastructure/store-redis/src/main/kotlin/org/fastcampus/store/redis/repository/StoreRedisRepositoryImpl.kt
+++ b/infrastructure/store-redis/src/main/kotlin/org/fastcampus/store/redis/repository/StoreRedisRepositoryImpl.kt
@@ -6,6 +6,7 @@ import org.springframework.data.geo.Point
 import org.springframework.data.redis.connection.RedisGeoCommands
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.stereotype.Component
+import java.util.concurrent.TimeUnit
 
 @Component
 class StoreRedisRepositoryImpl(
@@ -67,6 +68,7 @@ class StoreRedisRepositoryImpl(
     override fun addSearch(keyword: String) {
         val currentTime = System.currentTimeMillis() / 1000
         redisTemplate.opsForZSet().add("search:$keyword", currentTime.toString(), currentTime.toDouble())
+        redisTemplate.expire("search:$keyword", WINDOWDURATION.toLong(), TimeUnit.SECONDS)
     }
 
     override fun getTrendKeywords(): Map<String, Long>? {
@@ -78,14 +80,6 @@ class StoreRedisRepositoryImpl(
             .associate { it.key.removePrefix("search:") to it.value }
     }
 
-    override fun removeOldData() {
-        val currentTime = System.currentTimeMillis() / 1000
-        val thresholdTime = currentTime - WINDOWDURATION
-        redisTemplate.keys("search:*").forEach { key ->
-            redisTemplate.opsForZSet().removeRangeByScore(key, Double.NEGATIVE_INFINITY, thresholdTime.toDouble())
-        }
-    }
-
     private fun getRecentSearchCount(keyword: String): Long {
         val currentTime = System.currentTimeMillis() / 1000
         val startTime = currentTime - WINDOWDURATION
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dfb91e28..587f06b2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,3 +26,6 @@ include("infrastructure:order-redis")
 include("infrastructure:review-postgres")
 include("infrastructure:cart-mongo")
 include("infrastructure:favorite-postgres")
+include("infrastructure:order-mongo")
+include("infrastructure:external-pg-toss-payments")
+include("infrastructure:external-pg-pay200")