支付功能调试

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/ConfirmOrderActivity.kt

@@ -102,6 +102,7 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
     }
     vm.toPaymentEvent.observe(this) {
       Pingpp.createPayment(this, it)
+      Timber.tag("确认订单").e("支付charge：$it")
     }
 
   }
@@ -146,7 +147,8 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
           if (result.equals("success")) {
             vm.paymentSuccess()
           } else {
-            ToastUtils.showShortSafe("支付失败，错误原因：$errorMsg")
+            Timber.tag("确认订单").e("支付失败，错误原因：$errorMsg \n $extraMsg")
+            ToastUtils.showShortSafe("支付失败，错误原因：$errorMsg \n $extraMsg")
           }
         }
       }

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/ConfirmOrderViewModel.kt

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.border.ui
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.google.gson.Gson
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.bcommon.mvvm.ErrorInfo
 import com.yidian.bcommon.utils.ToastUtils
@@ -202,7 +203,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
       it?.let {
         ToastUtils.showShortSafe("获取charge成功：${it.size}")
         // 调起支付
-        _toPaymentEvent.value = it[0].v?.charges.toString()
+        _toPaymentEvent.value = Gson().toJson(it[0].v?.charges)
       }
     }
   }

Components/BOrder/src/main/res/layout/border_activity_confirm_order.xml

@@ -328,7 +328,7 @@
                             android:id="@+id/tv_discount_amount_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/discount_amount"
+                            android:text="@string/already_discount"
                             android:textColor="@color/color_333333"
                             android:textSize="@dimen/sp14"
                             app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"