支付调试优化

app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt

@@ -90,7 +90,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
                 val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
                 //不计费模式切换菜品，重新加载数据
-                if(mode == 1) {
+                if (mode == 1) {
                     presentation?.loadUnbilledMode()
                 }
             }
@@ -127,7 +127,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun initData() {
 //        viewModel.getEquipmentToken()
         viewModel.getUserFaceCache(pageNo = 1)
-       //viewModel.getUserFaceCache2()
+        //viewModel.getUserFaceCache2()
 
 //        presentation?.step1()
         presentation?.step1FoodRecognizing()
@@ -232,13 +232,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 val mealPickupMode = SPUtil.getInstance().get(GlobalKey.KEY_PICKUP_MODE, 0) ?: 0
                 val eatWeight = if (mealPickupMode == 0) {
                     //即放即取
-                    presentation?.recognitionWeight?:0.0
+                    presentation!!.recognitionWeight
                 } else {
-                    presentation?.recognitionWeight?.minus(lastWeight)?:0.0
+                    presentation!!.recognitionWeight - lastWeight
                 }
                 createOrder(
                     foodInfo = checkedItem!!,
-                    foodWeight = presentation?.lastWeight?.roundToInt()?:0,
+                    foodWeight = presentation?.lastWeight?.roundToInt() ?: 0,
                     eatWeight = eatWeight.roundToInt()
                 ) {
                     presentation?.dismiss()
@@ -683,7 +683,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         lastTouchTime = System.currentTimeMillis()
     }
 
-    fun createOrder(foodInfo: FoodInfo, foodWeight: Int, eatWeight: Int, block:()-> Unit) {
+    fun createOrder(foodInfo: FoodInfo, foodWeight: Int, eatWeight: Int, block: () -> Unit) {
+        if (foodWeight <= 5 || eatWeight <= 5) {
+            ToastUtils.showToast("请取走餐品")
+            return
+        }
         val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
         val order = FoodOrder(
             deviceId = GlobalData.deviceId,

app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt

@@ -217,6 +217,10 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
     fun memberPay(param: HashMap<String, String>, block: () -> Unit) {
         userViewModel.memberPay(param) {
             runOnUiThread {
+                if (it.not()) {
+                    ToastUtils.showToast("支付失败，请稍后重试")
+                    return@runOnUiThread
+                }
                 block()
             }
         }

app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt

@@ -53,15 +53,16 @@ class PayResultFragment : BaseFragment<FragmentPayResultBinding>() {
             memberInfo = it.getParcelable(MEMBER_INFO)
         }
 
-        totalPrice = payActivity?.foodInfo?.vipPrice ?: 0.0
         if (memberInfo != null) {
-            binding.layoutMemberInfo.visible()
+            totalPrice = payActivity?.foodInfo?.vipPrice ?: 0.0
+            binding.layoutVip.visible()
             balance = (memberInfo!!.topUpBalance ?: 0.0) + (memberInfo!!.rewardBalance ?: 0.0)
             realPayPrice = if (balance >= totalPrice) 0.0 else totalPrice - balance
             expensesBalance = if (balance >= totalPrice) totalPrice else balance
             loadUserInfo(memberInfo!!)
         } else {
-            binding.layoutMemberInfo.gone()
+            binding.layoutVip.gone()
+            totalPrice = payActivity?.foodInfo?.specPrice ?: 0.0
         }
 
         when (pageType) {