From 088aabc53560762761aa6430d82b2c960a6b4274 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 30 Jun 2026 09:51:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(discount):=20=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=8A=98=E6=89=A3=E7=A9=BA=E5=80=BC=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用Elvis操作符替代条件表达式判断空值
- 统一两个位置的折扣计算逻辑实现方式
- 提高代码可读性和简洁性
---
 app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt     | 2 +-
 .../com/sw/dualscreen/presentation/MainScreenPresentation.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
index ad8b645..df504f5 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
@@ -196,7 +196,7 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
             //val onePrice = if (isVip) foodInfo?.vipPrice else foodInfo?.specPrice
             if (isVip) {
                 userViewModel.getMemberDiscount(memberInfo?.faceUserId?:"") { discount ->
-                    memberDiscount = if (discount == null) 1.0 else discount / 10
+                    memberDiscount = discount ?: 1.0
                     var onePrice = foodInfo?.specPrice ?: 0.0
                     onePrice = if (isVip) onePrice * memberDiscount else onePrice
                     it.totalPrice = onePrice * eatNum
diff --git a/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
index ec88b17..f48f56c 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
@@ -1034,7 +1034,7 @@ class MainScreenPresentation(
 //                pauseCamera()
                 //先查询会员折扣
                 userViewModel.getMemberDiscount(userId) { discount ->
-                    memberDiscount = if (discount == null) 1.0 else discount / 10
+                    memberDiscount = discount ?: 1.0
                     step3ShowRecognizeResult(userId)
                 }
             })