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() { //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) } })