From 03712558e867be3aa91feef5e31c03e5483ead20 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 8 Nov 2024 21:03:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EA=B5=AC?=
 =?UTF-8?q?=EB=A7=A4=ED=99=95=EC=9D=B8=20=EB=8B=A4=EC=9D=B4=EC=96=BC?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20-=20=EB=8C=80=EC=97=AC=EB=A7=8C=20?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=EC=8B=9C=20100%=20=EA=B0=80=EA=B2=A9?=
 =?UTF-8?q?=EC=9D=84=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/AudioContentDetailActivity.kt          |  9 ++++++++-
 .../order/AudioContentOrderConfirmDialog.kt       | 15 ++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
index b6a03ac..fa81bdb 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
@@ -935,7 +935,14 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
             nickname = audioContent.creator.nickname,
             duration = audioContent.duration,
             orderType = orderType,
-            price = audioContent.price,
+            price = if (
+                audioContent.purchaseOption == PurchaseOption.BOTH &&
+                orderType == OrderType.RENTAL
+            ) {
+                ceil(audioContent.price * 0.7).toInt()
+            } else {
+                audioContent.price
+            },
             confirmButtonClick = {
                 startService(
                     Intent(this, AudioContentPlayService::class.java).apply {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
index e67fe8f..9946645 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
@@ -1,5 +1,6 @@
 package kr.co.vividnext.sodalive.audio_content.order
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -15,8 +16,8 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
 import kr.co.vividnext.sodalive.databinding.DialogAudioContentOrderConfirmBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import kr.co.vividnext.sodalive.extensions.moneyFormat
-import kotlin.math.ceil
 
+@SuppressLint("SetTextI18n")
 class AudioContentOrderConfirmDialog(
     activity: Activity,
     layoutInflater: LayoutInflater,
@@ -63,18 +64,10 @@ class AudioContentOrderConfirmDialog(
 
         if (SharedPreferenceManager.userId == 17958L) {
             dialogView.ivCan.visibility = View.GONE
-            dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) {
-                "${(ceil(price * 0.7).toInt() * 110).moneyFormat()}원"
-            } else {
-                "${(price * 110).moneyFormat()}원"
-            }
+            dialogView.tvPrice.text = "${(price * 110).moneyFormat()}원"
         } else {
             dialogView.ivCan.visibility = View.VISIBLE
-            dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) {
-                ceil(price * 0.7).toInt().moneyFormat()
-            } else {
-                price.moneyFormat()
-            }
+            dialogView.tvPrice.text = price.moneyFormat()
         }
 
         if (SharedPreferenceManager.userId == 17958L) {